MDL-12200 fixed problems when no custom user fields defined; merged from MOODLE_19_STABLE

diff --git a/user/filters/profilefield.php b/user/filters/profilefield.php
index 8a1e89824a2d544648ab33401d9c3a74a5388a06..bb7fefcb4e7333adc8d9f09e67cdf3a7167233dc 100644 (file)
--- a/user/filters/profilefield.php
+++ b/user/filters/profilefield.php
@@ -73,6 +73,12 @@ class user_filter_profilefield extends user_filter_type {
      * @return mixed array filter data or false when filter not set
      */
     function check_data($formdata) {
+        $profile_fields = $this->get_profile_fields();
+
+        if (empty($profile_fields)) {
+            return false;
+        }
+
         $field    = $this->_name;
         $operator = $field.'_op';
         $profile  = $field.'_fld';
@@ -96,10 +102,19 @@ class user_filter_profilefield extends user_filter_type {
     function get_sql_filter($data) {
         global $CFG;
 
+        $profile_fields = $this->get_profile_fields();
+        if (empty($profile_fields)) {
+            return '';
+        }
+
         $profile  = $data['profile'];
         $operator = $data['operator'];
         $value    = addslashes($data['value']);
 
+        if (!array_key_exists($profile, $profile_fields)) {
+            return '';
+        } 
+
         $where = "";
         $op = " IN ";
         $ilike = sql_ilike();
@@ -144,17 +159,25 @@ class user_filter_profilefield extends user_filter_type {
      * @return string active filter label
      */
     function get_label($data) {
-        $operators     = $this->get_operators();
-        $profilefields = $this->get_profile_fields();
+        $operators      = $this->get_operators();
+        $profile_fields = $this->get_profile_fields();
+
+        if (empty($profile_fields)) {
+            return '';
+        }
 
         $profile  = $data['profile'];
         $operator = $data['operator'];
         $value    = $data['value'];
 
+        if (!array_key_exists($profile, $profile_fields)) {
+            return '';
+        } 
+
         $a = new object();
         $a->label    = $this->_label;
         $a->value    = $value;
-        $a->profile  = $profilefields[$profile];
+        $a->profile  = $profile_fields[$profile];
         $a->operator = $operators[$operator];
 
         switch($operator) {