MDL-12550, wrong user count in role assignment

diff --git a/admin/roles/assign.html b/admin/roles/assign.html
index c987cbae14b018f9b9646a98d410faee3cb092d8..8720db3cc6900b362f96973eed4e5dacbe47cae0 100755 (executable)
--- a/admin/roles/assign.html
+++ b/admin/roles/assign.html
@@ -61,7 +61,7 @@
           <?php
             $i=0;
             if (!empty($searchtext)) {
-                echo "<optgroup label=\"$strsearchresults (" . $availableusers->_numOfRows . ")\">\n";
+                echo "<optgroup label=\"$strsearchresults (" . $usercount . ")\">\n";
                 while ($user = rs_fetch_next_record($availableusers)) {
                     $fullname = fullname($user, true);
                     echo "<option value=\"$user->id\">".$fullname.", ".$user->email."</option>\n";

diff --git a/admin/roles/assign.php b/admin/roles/assign.php
index a81f35b7ac0b1f2bb58ec18a6e21fe46fda14b6c..537231a0f5d367288a2c97205fbd4a1bb73f89f6 100755 (executable)
--- a/admin/roles/assign.php
+++ b/admin/roles/assign.php
@@ -362,7 +362,7 @@
                     $availableusers = get_recordset_sql($select . $from . $where . $selectsql . $excsql);
                 }
 
-                $usercount =  count_records_sql($countselect . $from . $where) - count($contextusers);
+                $usercount =  $availableusers->_numOfRows;
             }
 
         } else {
@@ -388,8 +388,8 @@
                                                     AND r.roleid = '.$roleid.'
                                                     '.$selectsql.')
                                                 ORDER BY lastname ASC, firstname ASC');
-            $usercount = count_records_select('user', $select) - count($contextusers);
 
+            $usercount = $availableusers->_numOfRows;         
         }
 
         echo '<div class="selector">';