MDL-14417 fixed sql for menu adv search - multimenu already fixed tod…

…ay; merged from MOODLE_19_STABLE
moodle · Apr 19, 2008 · a4e3818 · a4e3818
1 parent 029cf84
commit a4e3818
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 9 deletions.
diff --git a/mod/data/field/menu/field.class.php b/mod/data/field/menu/field.class.php
@@ -57,17 +57,37 @@ function display_add_field($recordid=0) {
         return $str;
     }
 
-    function display_search_field($value = '') {
+    function display_search_field($content = '') {
         global $CFG;
-        $temp = get_records_sql_menu('SELECT id, content from '.$CFG->prefix.'data_content WHERE fieldid='.$this->field->id.' GROUP BY content ORDER BY content');
+
+        $usedoptions = array();
+        $sql = "SELECT DISTINCT content
+                  FROM {$CFG->prefix}data_content
+                 WHERE fieldid={$this->field->id} AND content IS NOT NULL";
+        if ($used = get_records_sql($sql)) {
+            foreach ($used as $data) {
+                $value = $data->content;
+                if ($value === '') {
+                    continue;
+                }
+                $usedoptions[$value] = $value;
+            }
+        }
+
         $options = array();
-        if(!empty($temp)) {
-            $options[''] = '';              //Make first index blank.
-            foreach ($temp as $key) {
-                $options[$key] = $key;  //Build following indicies from the sql.
+        foreach (explode("\n",$this->field->param1) as $option) {
+            $option = trim($option);
+            if (!isset($usedoptions[$option])) {
+                continue;
             }
+            $options[$option] = $option;
+        }
+        if (!$options) {
+            // oh, nothing to search for
+            return '';
         }
-        return choose_from_menu($options, 'f_'.$this->field->id, $value, 'choose', '', 0, true);    
+
+        return choose_from_menu($options, 'f_'.$this->field->id, stripslashes($content), '&nbsp;', '', 0, true);    
     }
 
      function parse_search_field() {

diff --git a/mod/data/field/multimenu/field.class.php b/mod/data/field/multimenu/field.class.php
@@ -81,11 +81,11 @@ function display_search_field($value = '') {
         $usedoptions = array();
         $sql = "SELECT DISTINCT content
                   FROM {$CFG->prefix}data_content
-                 WHERE fieldid={$this->field->id}";
+                 WHERE fieldid={$this->field->id} AND content IS NOT NULL";
         if ($used = get_records_sql($sql)) {
             foreach ($used as $data) {
                 $valuestr = $data->content;
-                if (is_null($valuestr) or $valuestr === '') {
+                if ($valuestr === '') {
                     continue;
                 }
                 $values = explode('##', $valuestr);