Merge commit 'origin/master' into hruid

[platal.git] / include / userset.inc.php

diff --git a/include/userset.inc.php b/include/userset.inc.php
index 49c0e02..21d5b0b 100644 (file)
--- a/include/userset.inc.php
+++ b/include/userset.inc.php
@@ -137,7 +137,7 @@ class ArraySet extends UserSet
     {
         $where = $this->getUids($users);
         if ($where) {
-            $where = "a.alias IN ($where)";
+            $where = "u.hruid IN ($where)";
         } else {
             $where = " 0 ";
         }
@@ -146,7 +146,7 @@ class ArraySet extends UserSet
 
     private function getUids(array $users)
     {
-        $users = get_users_forlife_list($users, true, '_silent_user_callback');
+        $users = User::getBulkHruid($users, array('User', '_silent_user_callback'));
         if (is_null($users)) {
             return '';
         }