Changeset 27933 for branches/2.5/include/functions_search.inc.php

Timestamp:

Mar 25, 2014, 1:53:10 PM (10 years ago)

Author:

plg

Message:

merge r26825 from trunk to branch 2.5

bug 3020 and bug 3021 fixed: additionnal checks in search inputs

File:

• branches/2.5/include/functions_search.inc.php (modified) (1 diff)

branches/2.5/include/functions_search.inc.php

@@ -118 +118 @@
       );
 
-    array_push(
-      $clauses,
-      "\n         ".
+    // make sure the "mode" is either OR or AND
+    if ($search['fields']['allwords']['mode'] != 'AND' and $search['fields']['allwords']['mode'] != 'OR')
+    {
+      $search['fields']['allwords']['mode'] = 'AND';
+    }
+
+    $clauses[] = "\n         ".
       implode(
         "\n         ".