Changeset 1054 for branches

Timestamp:

Feb 23, 2006, 10:38:00 PM (18 years ago)

Author:

plg

Message:

bug 278 fixed: calendar on date_available could not work because
date_available has a datetime MySQL column format while date_creation has a
date MySQL column format. We use DATE_FORMAT MySQL function to resolv this
issue.

Location:

branches/branch-1_5/include

Files:

• category_calendar.inc.php (modified) (3 diffs)
• functions_category.inc.php (modified) (1 diff)

branches/branch-1_5/include/category_calendar.inc.php

@@ -188 +188 @@
   FROM '.IMAGES_TABLE.' INNER JOIN '.IMAGE_CATEGORY_TABLE.' ON id = image_id
   '.$page['where'].'
-    AND '.$conf['calendar_datefield'].' = \''.$page['calendar_date'].'\'
+    AND DATE_FORMAT('.$conf['calendar_datefield'].', \'%Y-%c-%e\')'
+    .' = \''.$page['calendar_date'].'\'
   GROUP BY category_id
 ;';
@@ -338 +339 @@
   FROM '.IMAGES_TABLE.' INNER JOIN '.IMAGE_CATEGORY_TABLE.' ON id = image_id
   '.$page['where'].'
-    AND '.$conf['calendar_datefield'].' = \''.$calendar_day.'\'
+    AND DATE_FORMAT('.$conf['calendar_datefield'].', \'%Y-%m-%d\')'
+      .' = \''.$calendar_day.'\'
   ORDER BY RAND()
   LIMIT 0,1
@@ -406 +408 @@
   FROM '.IMAGES_TABLE.', '.IMAGE_CATEGORY_TABLE.'
   '.$page['where'].'
-    AND '.$conf['calendar_datefield'].' = \''.$page['calendar_date'].'\'';
+    AND DATE_FORMAT('.$conf['calendar_datefield'].', \'%Y-%c-%e\')'
+      .' = \''.$page['calendar_date'].'\'';
     if ($calendar_category != 0)
     {

branches/branch-1_5/include/functions_category.inc.php

@@ -488 +488 @@
           if (isset($search['fields'][$key]))
           {
-            $local_clause = $datefield." = '";
+            $local_clause = 'DATE_FORMAT('.$datefield.", '%Y-%m-%d') = '";
             $local_clause.= str_replace('.', '-',
                                         $search['fields'][$key]['words'][0]);