Changeset 4906 for OpenPNE/trunk

Timestamp:

Jan 11, 2008, 1:38:50 PM (15 years ago)

Author:

ogawa

Message:

#1760:lib/smarty_plugins/modifier.date_format.phpの変更点をformatのデフォルト値と、日本語対応のみにした

File:

• OpenPNE/trunk/lib/smarty_plugins/modifier.date_format.php (modified) (3 diffs)

OpenPNE/trunk/lib/smarty_plugins/modifier.date_format.php

@@ -8 +8 @@
  * Include the {@link shared.make_timestamp.php} plugin
  */
-require_once $smarty->_get_plugin_filepath('shared','make_timestamp');
+require_once $smarty->_get_plugin_filepath('shared', 'make_timestamp');
 /**
  * Smarty date_format modifier plugin
@@ -28 +28 @@
  * @uses smarty_make_timestamp()
  */
-function smarty_modifier_date_format($string, $format = '%m/%d', $default_date = null)
+function smarty_modifier_date_format($string, $format = '%m/%d', $default_date = '')
 {
-    if (!($ts = smarty_make_timestamp($string))
-        && ((empty($default_date) || !$ts = smarty_make_timestamp($default_date)))) {
+    if ($string != '') {
+        $timestamp = smarty_make_timestamp($string);
+    } elseif ($default_date != '') {
+        $timestamp = smarty_make_timestamp($default_date);
+    } else {
         return;
     }
-
     if (DIRECTORY_SEPARATOR == '\\') {
         $_win_from = array('%D',       '%h', '%n', '%r',          '%R',    '%t', '%T');
@@ -40 +42 @@
         if (strpos($format, '%e') !== false) {
             $_win_from[] = '%e';
-            $_win_to[]   = sprintf('%\' 2d', date('j', $ts));
+            $_win_to[]   = sprintf('%\' 2d', date('j', $timestamp));
         }
         if (strpos($format, '%l') !== false) {
             $_win_from[] = '%l';
-            $_win_to[]   = sprintf('%\' 2d', date('h', $ts));
+            $_win_to[]   = sprintf('%\' 2d', date('h', $timestamp));
         }
         $format = str_replace($_win_from, $_win_to, $format);
     }
-
     return preg_replace_callback('/\%[a-z\%]/iu',
-        create_function('$res', 'return strftime($res[0], '.$ts.');'),
+        create_function('$res', 'return strftime($res[0], '.$timestamp.');'),
         $format);
 }