Merge pull request #345 from Jacq/master

When using an auth.model that is not of "Users" the pivot id is incorrectly assumed as 'role_user'
Zizaco · Aug 7, 2015 · 62c1848 · 62c1848
2 parents a6b4d81 + 6919d48
commit 62c1848
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/Entrust/Traits/EntrustRoleTrait.php b/src/Entrust/Traits/EntrustRoleTrait.php
@@ -19,7 +19,8 @@ trait EntrustRoleTrait
      */
     public function users()
     {
-        return $this->belongsToMany(Config::get('auth.model'), Config::get('entrust.role_user_table'));
+        return $this->belongsToMany(Config::get('auth.model'), Config::get('entrust.role_user_table'),'role_id','user_id');
+       // return $this->belongsToMany(Config::get('auth.model'), Config::get('entrust.role_user_table'));
     }
 
     /**