From ce187863e8585421cf75e5b4854eeb4a9e0678c5 Mon Sep 17 00:00:00 2001 From: nikrou Date: Thu, 10 Jun 2010 21:07:22 +0000 Subject: Bug 1730 fixed : search doesn't work when database engine is not mysql For posgresql and sqlite date must allways use day and month with two diggits. git-svn-id: http://piwigo.org/svn/trunk@6518 68402e56-0260-453c-a942-63ccdbb3a9ee --- search.php | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) (limited to 'search.php') diff --git a/search.php b/search.php index 9e30e38fa..87b8246ce 100644 --- a/search.php +++ b/search.php @@ -39,7 +39,7 @@ if (isset($_POST['submit'])) { if (!is_array($post_value)) { - $_POST[$post_key] = mysql_real_escape_string($post_value); + $_POST[$post_key] = pwg_db_real_escape_string($post_value); } } @@ -106,13 +106,11 @@ if (isset($_POST['submit'])) if (!empty($_POST['start_year'])) { $search['fields'][$type_date.'-after'] = array( - 'date' => join( - '-', - array( - $_POST['start_year'], - $_POST['start_month'] != 0 ? $_POST['start_month'] : '01', - $_POST['start_day'] != 0 ? $_POST['start_day'] : '01', - ) + 'date' => sprintf( + '%d-%02d-%02d', + $_POST['start_year'], + $_POST['start_month'] != 0 ? $_POST['start_month'] : '01', + $_POST['start_day'] != 0 ? $_POST['start_day'] : '01' ), 'inc' => true, ); @@ -121,14 +119,12 @@ if (isset($_POST['submit'])) if (!empty($_POST['end_year'])) { $search['fields'][$type_date.'-before'] = array( - 'date' => join( - '-', - array( - $_POST['end_year'], - $_POST['end_month'] != 0 ? $_POST['end_month'] : '12', - $_POST['end_day'] != 0 ? $_POST['end_day'] : '31', - ) - ), + 'date' => sprintf( + '%d-%02d-%02d', + $_POST['end_year'], + $_POST['end_month'] != 0 ? $_POST['end_month'] : '12', + $_POST['end_day'] != 0 ? $_POST['end_day'] : '31' + ), 'inc' => true, ); } -- cgit v1.2.3