### Eclipse Workspace Patch 1.0
#P 18stable
Index: message/lib.php
===================================================================
RCS file: /cvsroot/moodle/moodle/message/lib.php,v
retrieving revision 1.59.2.2
diff -u -r1.59.2.2 lib.php
--- message/lib.php	21 Nov 2007 07:46:46 -0000	1.59.2.2
+++ message/lib.php	13 Jan 2008 16:37:40 -0000
@@ -710,7 +710,7 @@
         return get_records_sql("SELECT $fields
                       FROM {$CFG->prefix}user u
                       WHERE $select
-                          AND ($fullname $LIKE '%$searchtext%')
+                          AND ($fullname $LIKE '%$searchtext%' OR (u.email $LIKE '%$searchtext%' AND u.maildisplay=1) OR u.username $LIKE '%$searchtext%')
                           $except $order");
     } else {
 
@@ -724,7 +724,7 @@
                                  WHERE $select
                                        AND ra.contextid $contextlists
                                        AND u.id = ra.userid
-                                       AND ($fullname $LIKE '%$searchtext%')
+                                       AND ($fullname $LIKE '%$searchtext%' OR (u.email $LIKE '%$searchtext%' AND u.maildisplay>0) OR u.username $LIKE '%$searchtext%')
                                        $except $order");
 
         return $users;