Merged from MOODLE_14_STABLE: Added empty rather than just testing variable, added...

diff --git a/lib/datalib.php b/lib/datalib.php
index 73df269af4c89e274aa90a1f39a605ce66c385e5..dd81fb5d19340abd5915fee740b78d4e35720a0b 100644 (file)
--- a/lib/datalib.php
+++ b/lib/datalib.php
@@ -1713,7 +1713,8 @@ function get_users($get=true, $search='', $confirmed=false, $exceptions='', $sor
 
     $select = 'username <> \'guest\' AND deleted = 0';
 
-    if ($search) {
+    if (!empty($search)){
+        $search = trim($search);
         $select .= " AND ($fullname $LIKE '%$search%' OR email $LIKE '%$search%') ";
     }
 
@@ -1787,7 +1788,8 @@ function get_users_listing($sort='lastaccess', $dir='ASC', $page=0, $recordsperp
 
     $select = 'deleted <> 1';
 
-    if ($search) {
+    if (!empty($search)) {
+        $search = trim($search);
         $select .= " AND ($fullname $LIKE '%$search%' OR email $LIKE '%$search%') ";
     }