Changeset 6519

Timestamp:

Jun 10, 2010, 11:08:34 PM (14 years ago)

Author:

nikrou

Message:

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.
merge from trunk

Location:

branches/2.1

Files:

• include/functions_search.inc.php (modified) (1 diff)
• search.php (modified) (3 diffs)

branches/2.1/include/functions_search.inc.php

@@ -224 +224 @@
   {
     $query = '
-SELECT DISTINCT(id)
+SELECT id
   FROM '.IMAGES_TABLE.' i
     INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON id = ic.image_id

branches/2.1/search.php

@@ -40 +40 @@
     if (!is_array($post_value))
     {
-      $_POST[$post_key] = mysql_real_escape_string($post_value);
+      $_POST[$post_key] = pwg_db_real_escape_string($post_value);
     }
   }  
@@ -107 +107 @@
   {
     $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,
@@ -122 +120 @@
   {
     $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,
       );