From: moodler <moodler>
Date: Mon, 10 Apr 2006 16:12:53 +0000 (+0000)
Subject: Fix for bug 5144  (nickname field)
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=f0cb18e6274b73e29e8a5fba59d5f98f057c84dd;p=moodle.git

Fix for bug 5144  (nickname field)
---

diff --git a/user/index.php b/user/index.php
index 4718f02daa..5b43d98208 100644
--- a/user/index.php
+++ b/user/index.php
@@ -464,7 +464,7 @@ function checkchecked(form) {
     if (!empty($search)) {
         $LIKE = sql_ilike();
         $fullname  = sql_fullname('u.firstname','u.lastname');
-        $wheresearch .= ' AND ('. $fullname .' '. $LIKE .'\'%'. $search .'%\' OR email '. $LIKE .'\'%'. $search .'%\' OR nickname '.$LIKE.' \'%'.$search.'%\' OR idnumber '.$LIKE.' \'%'.$search.'%\') ';
+        $wheresearch .= ' AND ('. $fullname .' '. $LIKE .'\'%'. $search .'%\' OR email '. $LIKE .'\'%'. $search .'%\' OR idnumber '.$LIKE.' \'%'.$search.'%\') ';
 
     }
 
diff --git a/user/messageselect.php b/user/messageselect.php
index 0abba22c1d..3ade69b775 100644
--- a/user/messageselect.php
+++ b/user/messageselect.php
@@ -44,7 +44,7 @@
     foreach ($_POST as $k => $v) {
         if (preg_match('/^(user|teacher)(\d+)$/',$k,$m)) {
             if (!array_key_exists($m[2],$SESSION->emailto[$id])) {
-                if ($user = get_record_select('user','id = '.$m[2],'id,firstname,lastname,idnumber,nickname,email,emailstop,mailformat')) {
+                if ($user = get_record_select('user','id = '.$m[2],'id,firstname,lastname,idnumber,email,emailstop,mailformat')) {
                     $SESSION->emailto[$id][$m[2]] = $user;
                     $SESSION->emailto[$id][$m[2]]->teacher = ($m[1] == 'teacher');
                     $count++;
@@ -125,4 +125,4 @@
     print_footer();
 
 }
-?>
\ No newline at end of file
+?>