BUG: refs #0426. Fix user search model method on pgsql (was broken)

Author: zachmullen

core/controllers/SearchController.php

@@ -298,7 +298,7 @@ public function liveAction()
         }
       $label = $userDao->getFirstname().' '.$userDao->getLastname();
       $value = $label;
-      if($userDao->count > 1)
+      if(isset($userDao->count) && $userDao->count > 1)
         {
         $label .= ' ('.$userDao->count.')';
         }
@@ -307,7 +307,7 @@ public function liveAction()
                       'value' => $value,
                       'category' => $this->t('Users'));
 
-      if($userDao->count == 1)
+      if(!isset($userDao->count) || $userDao->count == 1)
         {
         $result['userid'] = $userDao->getKey();
         }

core/models/pdo/UserModel.php

@@ -212,38 +212,38 @@ function getUsersFromSearch($search, $userDao, $limit = 14, $group = true, $orde
     if($isAdmin)
       {
       $sql  ->where(' ('.
-          $this->database->getDB()->quoteInto('firstname LIKE ?', '%'.$search.'%').' OR '.
-          $this->database->getDB()->quoteInto('lastname LIKE ?', '%'.$search.'%').')')
+          $this->database->getDB()->quoteInto('u.firstname LIKE ?', '%'.$search.'%').' OR '.
+          $this->database->getDB()->quoteInto('u.lastname LIKE ?', '%'.$search.'%').')')
           ->limit($limit)
           ->setIntegrityCheck(false);
       }
     else
       {
-      $sql  ->where('(privacy = '.MIDAS_USER_PUBLIC.' OR ('.
+      $sql  ->where('(u.privacy = '.MIDAS_USER_PUBLIC.' OR ('.
           $subqueryUser.')>0'.') AND ('.
-          $this->database->getDB()->quoteInto('firstname LIKE ?', '%'.$search.'%').' OR '.
-          $this->database->getDB()->quoteInto('lastname LIKE ?', '%'.$search.'%').')')
+          $this->database->getDB()->quoteInto('u.firstname LIKE ?', '%'.$search.'%').' OR '.
+          $this->database->getDB()->quoteInto('u.lastname LIKE ?', '%'.$search.'%').')')
           ->limit($limit)
           ->setIntegrityCheck(false);
       }
 
 
     if($group)
       {
-      $sql->group(array('firstname', 'lastname'));
+      $sql->group(array('u.firstname', 'u.lastname'));
       }
 
     switch($order)
       {
       case 'name':
-        $sql->order(array('lastname ASC', 'firstname ASC'));
+        $sql->order(array('u.lastname ASC', 'u.firstname ASC'));
         break;
       case 'date':
-        $sql->order(array('creation ASC'));
+        $sql->order(array('u.creation ASC'));
         break;
       case 'view':
       default:
-        $sql->order(array('view DESC'));
+        $sql->order(array('u.view DESC'));
         break;
       }
     $rowset = $this->database->fetchAll($sql);