Fix regression causing UserModel error. Fixes #265

This commit fixes a regression introduced in b44c9ab (Add parameters to fix the MIDAS API display)
midasplatform · Mar 6, 2017 · 549525a · 549525a
1 parent 30c6dda
commit 549525a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/core/controllers/components/ApiuserComponent.php b/core/controllers/components/ApiuserComponent.php
@@ -63,7 +63,14 @@ public function userList($args)
         /** @var UserModel $userModel */
         $userModel = MidasLoader::loadModel('User');
 
-        return $userModel->getAll(true, $args['limit'], array('firstname','lastname','company','website'));
+        return $userModel->getAll(
+            /* $onlyPublic = */ true,
+            /* $limit = */ $args['limit'],
+            /* $order = */ 'lastname',
+            /* $offset = */ null,
+            /* $currentUser = */ null,
+            /* $fields = */ array('firstname','lastname','company','website')
+            );
     }
 
     /**

diff --git a/core/models/pdo/UserModel.php b/core/models/pdo/UserModel.php
@@ -103,7 +103,7 @@ public function getUserCommunities($userDao)
     }
 
     /** Get all */
-    public function getAll($onlyPublic = false, $limit = 20, $fields = array('*'), $order = 'lastname', $offset = null, $currentUser = null)
+    public function getAll($onlyPublic = false, $limit = 20, $order = 'lastname', $offset = null, $currentUser = null, $fields = array('*'))
     {
         $sql = $this->database->select();
         $sql->from("user", $fields);