Merge branch 'wip-mdl-35489-m23' of git://github.com/rajeshtaneja/moo…

…dle into MOODLE_23_STABLE
moodle · Oct 30, 2012 · 59d01f9 · 59d01f9
2 parents aa7d8ef + 4e15f69
commit 59d01f9
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/user/filters/text.php b/user/filters/text.php
@@ -62,7 +62,12 @@ function check_data($formdata) {
                 // no data - no change except for empty filter
                 return false;
             }
-            return array('operator'=>(int)$formdata->$operator, 'value'=>$formdata->$field);
+            // If field value is set then use it, else it's null.
+            $fieldvalue = null;
+            if (isset($formdata->$field)) {
+                $fieldvalue = $formdata->$field;
+            }
+            return array('operator' => (int)$formdata->$operator, 'value' =>  $fieldvalue);
         }
 
         return false;