From a5c1df9bcf274be22c2fb60e64c571e4998d5a11 Mon Sep 17 00:00:00 2001
From: toyomoyo <toyomoyo>
Date: Wed, 12 Dec 2007 03:30:50 +0000
Subject: [PATCH] MDL-12550, wrong user count in role assignment

---
 admin/roles/assign.html |  2 +-
 admin/roles/assign.php  | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/admin/roles/assign.html b/admin/roles/assign.html
index ccdb83ecd74..741009df6d7 100755
--- a/admin/roles/assign.html
+++ b/admin/roles/assign.html
@@ -58,7 +58,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 ca0d604caea..5425cd70543 100755
--- a/admin/roles/assign.php
+++ b/admin/roles/assign.php
@@ -300,8 +300,9 @@
             
                     $availableusers = get_recordset_sql($select . $from . $where . $selectsql . $excsql);         
                 }
-                
-                $usercount =  count_records_sql($countselect . $from . $where) - count($contextusers);
+
+                $usercount =  $availableusers->_numOfRows;
+
             }
 
         } else { 
@@ -327,8 +328,9 @@
                                                     AND r.roleid = '.$roleid.'
                                                     '.$selectsql.')
                                                 ORDER BY lastname ASC, firstname ASC');
-            $usercount = count_records_select('user', $select) - count($contextusers);
-   
+
+            $usercount = $availableusers->_numOfRows;         
+
         }
     
         echo '<div style="text-align:center">'.$strcurrentcontext.': '.print_context_name($context).'<br/>';