Dynamically get the user's primary key

thomastkim · Nov 23, 2015 · 5f6d4ba · 5f6d4ba
1 parent 0dfe5fa
commit 5f6d4ba
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/Kim/Activity/Scopes/ActivityOrderingScope.php b/src/Kim/Activity/Scopes/ActivityOrderingScope.php
@@ -37,8 +37,10 @@ protected function registerRelationshipOrderingQuery(Builder $query, Model $mode
             $table = $model->getTable();
 
             $userTable = config('auth.table');
+            $userModel = config('auth.model');
+            $userKey = (new $userModel)->getKeyName();
 
-            return $query->join($userTable, "{$table}.user_id", '=', "{$userTable}.id")->orderBy("{$userTable}.{$column}", $dir);
+            return $query->join($userTable, "{$table}.user_id", '=', "{$userTable}.{$userKey}")->orderBy("{$userTable}.{$column}", $dir);
         };
 
         $query->macro('orderByUsers', $macro);