Merge branch 'wip-mdl-35489-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE

2012-10-30 12:12:01 +08:00
parent b277186a4e 62e1fab324
commit 4c8582b8c0
1 changed files with 6 additions and 1 deletions
@@ -62,7 +62,12 @@ class user_filter_text extends user_filter_type {
                // 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;