Changeset 2857

Timestamp:

Nov 9, 2008, 10:49:46 PM (15 years ago)

Author:

rub

Message:

Resolved issue 0000900: format_date function doesn't work when time is omitted with 'mysql_datetime' type

Continue correction of grum

merge -c2856 from trunk to branch 2.0
The exact copy of commit log in 2856.

Location:

branches/2.0/include

Files:

• category_default.inc.php (modified) (2 diffs)
• functions.inc.php (modified) (1 diff)

branches/2.0/include/category_default.inc.php

@@ -118 +118 @@
       'FILE_POSTED' => format_date($row['date_available'], 'mysql_datetime'),
       'FILE_CREATED' => (empty($row['date_creation'])) ? 
-        '-': format_date($row['date_creation'], 'us'),
+        '-': format_date($row['date_creation'], 'mysql_date'),
       'FILE_DESC' => (empty($row['comment'])) ? '-' : $row['comment'],
       'FILE_AUTHOR' => (empty($row['author'])) ? '-' : $row['author'],
@@ -126 +126 @@
       'FILE_HEIGHT' => (empty($row['height'])) ? '-' : $row['height'],
       'FILE_METADATE' => (empty($row['date_metadata_update'])) ? 
-        '-': format_date($row['date_metadata_update'], 'us'),
+        '-': format_date($row['date_metadata_update'], 'mysql_date'),
       'FILE_RATE' => (empty($row['rate'])) ? '-' : $row['rate'], 
       'FILE_HAS_HD' => ($row['has_high'] and $user['enabled_high']=='true') ? 

branches/2.0/include/functions.inc.php

@@ -602 +602 @@
       break;
     }
+    case 'mysql_date' :
+    {
+      preg_match('/^(\d{4})-(\d{2})-(\d{2})$/',
+                 $date, $out);
+      list($year,$month,$day) =
+        array($out[1],$out[2],$out[3]);
+      break;
+    }
   }
   $formated_date = '';