Fix for bug #2323 - forum search problem

moodle · Dec 31, 2004 · 9ccdcd9 · 9ccdcd9
1 parent 4f2ed95
commit 9ccdcd9
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/lib/weblib.php b/lib/weblib.php
@@ -1394,7 +1394,7 @@ function highlight($needle, $haystack, $case=0,
         return $haystack;
     }
 
-    $list_of_words = eregi_replace("[^-a-zA-Z0-9&']", " ", $needle);
+    $list_of_words = eregi_replace("[^-a-zA-Z0-9&.']", " ", $needle);
     $list_array = explode(' ', $list_of_words);
     for ($i=0; $i<sizeof($list_array); $i++) {
         if (strlen($list_array[$i]) == 1) {
@@ -1419,12 +1419,18 @@ function highlight($needle, $haystack, $case=0,
     if ($list_of_words_cp{strlen($list_of_words_cp)-1}=='|') {
         $list_of_words_cp{strlen($list_of_words_cp)-1}='';
     }
-    $list_of_words_cp = '('. trim($list_of_words_cp) .')';
 
-    if (!$case){
-        $haystack = eregi_replace($list_of_words_cp, $left_string ."\\1". $right_string, $haystack);
-    } else {
-        $haystack = ereg_replace($list_of_words_cp, $left_string ."\\1". $right_string, $haystack);
+    $list_of_words_cp = trim($list_of_words_cp);
+
+    if ($list_of_words_cp) {
+
+      $list_of_words_cp = "(". $list_of_words_cp .")";
+
+      if (!$case){
+        $haystack = eregi_replace("$list_of_words_cp", "$left_string"."\\1"."$right_string", $haystack);
+      } else {
+        $haystack = ereg_replace("$list_of_words_cp", "$left_string"."\\1"."$right_string", $haystack);
+      }
     }
     $haystack = str_replace(array_keys($final),$final,$haystack);