From: skodak <skodak>
Date: Sat, 5 Jul 2008 12:54:38 +0000 (+0000)
Subject: fixed previous wrong merging
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=961ca45fc023fd1c7008c6f2fae2fdb80b3e0511;p=moodle.git

fixed previous wrong merging
---

diff --git a/user/filters/lib.php b/user/filters/lib.php
index d0a0481f81..decedf7a72 100644
--- a/user/filters/lib.php
+++ b/user/filters/lib.php
@@ -94,7 +94,7 @@ class user_filtering {
      * @return object filter
      */
     function get_field($fieldname, $advanced) {
-        global $USER, $DB;
+        global $USER, $CFG, $DB;
 
         switch ($fieldname) {
             case 'username':    return new user_filter_text('username', get_string('username'), $advanced, 'username');