FIX:テンプレートの日付のフッター未設定時に目次ページでアイテムの下部に日付が表示されてしまう不具合の修正 日付のヘッダー出力処理で代入する変数が間違っているのを修正

diff --git a/nucleus/libs/BLOG.php b/nucleus/libs/BLOG.php
index 7df6890..715c868 100644 (file)
--- a/nucleus/libs/BLOG.php
+++ b/nucleus/libs/BLOG.php
@@ -219,13 +219,13 @@ class Blog
                                                $oldTS = strtotime($old_date);\r
                                                $manager->notify('PreDateFoot',array('blog' => &$this, 'timestamp' => $oldTS));\r
                                                \r
-                                               if ( !in_array('DATE_FOOTER', $template) || !empty($template['DATE_FOOTER']) )\r
+                                               if ( in_array('DATE_FOOTER', $template) && !empty($template['DATE_FOOTER']) )\r
                                                {\r
-                                                       $tmp_footer = i18n::formatted_datetime('', $oldTS);\r
+                                                       $tmp_footer = i18n::formatted_datetime($template['DATE_FOOTER'], $oldTS);\r
                                                }\r
                                                else\r
                                                {\r
-                                                       $tmp_footer = i18n::formatted_datetime($template['DATE_FOOTER'], $oldTS);\r
+                                                       $tmp_footer = '';\r
                                                }\r
                                                $parser->parse($tmp_footer);\r
                                                $manager->notify('PostDateFoot',array('blog' => &$this, 'timestamp' => $oldTS));\r
@@ -235,15 +235,14 @@ class Blog
                                        \r
                                        // note, to use templatvars in the dateheader, the %-characters need to be doubled in\r
                                        // order to be preserved by strftime\r
-                                       if ( !in_array('DATE_HEADER', $template) || !empty($template['DATE_HEADER']) )\r
+                                       if ( in_array('DATE_HEADER', $template) && !empty($template['DATE_HEADER']) )\r
                                        {\r
-                                               $tmp_footer = i18n::formatted_datetime('', $timestamp);\r
+                                               $tmp_header = i18n::formatted_datetime($template['DATE_HEADER'], $timestamp);\r
                                        }\r
                                        else\r
                                        {\r
-                                               $tmp_footer = i18n::formatted_datetime($template['DATE_FOOTER'], $timestamp);\r
+                                               $tmp_header = '';\r
                                        }\r
-                                       \r
                                        $parser->parse($tmp_header);\r
                                        $manager->notify('PostDateHead',array('blog' => &$this, 'timestamp' => $timestamp));\r
                                }\r