From 7f39d5b695f90f5d622f9b070a5a4815c584e707 Mon Sep 17 00:00:00 2001 From: plegall Date: Fri, 17 Jan 2014 12:50:14 +0000 Subject: bug 3020 and bug 3021 fixed: additionnal checks in search inputs git-svn-id: http://piwigo.org/svn/trunk@26825 68402e56-0260-453c-a942-63ccdbb3a9ee --- include/functions_search.inc.php | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'include/functions_search.inc.php') diff --git a/include/functions_search.inc.php b/include/functions_search.inc.php index 66452459e..9cf50d602 100644 --- a/include/functions_search.inc.php +++ b/include/functions_search.inc.php @@ -113,6 +113,12 @@ function get_sql_search_clause($search) create_function('&$s','$s="(".$s.")";') ); + // 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 ". $search['fields']['allwords']['mode']. "\n ", -- cgit v1.2.3