From e0435f830eebc320bcb5813d945cf7b209163c67 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E3=81=97=E3=81=A5=E3=81=8D?= Date: Sun, 1 Apr 2012 16:15:30 +0900 Subject: [PATCH] =?utf8?q?=E3=82=B3=E3=83=94=E3=83=BC=E3=83=A9=E3=82=A4?= =?utf8?q?=E3=83=88=E8=A1=A8=E7=A4=BA=E9=83=A8=E5=88=86=E3=81=AE=E5=B9=B4?= =?utf8?q?=E5=BA=A6=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- action.php | 4 ++-- atom.php | 4 ++-- nucleus/bookmarklet.php | 4 ++-- nucleus/index.php | 4 ++-- nucleus/javascript/admin.js | 2 +- nucleus/javascript/bookmarklet.js | 2 +- nucleus/javascript/compatibility.js | 2 +- nucleus/javascript/edit.js | 2 +- nucleus/javascript/numbercheck.js | 2 +- nucleus/javascript/opennew.js | 2 +- nucleus/javascript/templateEdit.js | 2 +- nucleus/javascript/xmlhttprequest.js | 2 +- nucleus/libs/ACTION.php | 4 ++-- nucleus/libs/ACTIONLOG.php | 4 ++-- nucleus/libs/ACTIONS.php | 8 ++++---- nucleus/libs/ADMIN.php | 4 ++-- nucleus/libs/BAN.php | 4 ++-- nucleus/libs/BLOG.php | 26 +++++++++++++------------- nucleus/libs/BODYACTIONS.php | 4 ++-- nucleus/libs/BaseActions.php | 4 ++-- nucleus/libs/COMMENTACTIONS.php | 4 ++-- nucleus/libs/COMMENTS.php | 4 ++-- nucleus/libs/ENCAPSULATE.php | 4 ++-- nucleus/libs/ITEM.php | 20 ++++++++++---------- nucleus/libs/ITEMACTIONS.php | 4 ++-- nucleus/libs/KARMA.php | 4 ++-- nucleus/libs/MANAGER.php | 4 ++-- nucleus/libs/MEDIA.php | 4 ++-- nucleus/libs/MEMBER.php | 4 ++-- nucleus/libs/NOTIFICATION.php | 4 ++-- nucleus/libs/PAGEFACTORY.php | 4 ++-- nucleus/libs/PARSER.php | 4 ++-- nucleus/libs/PLUGIN.php | 4 ++-- nucleus/libs/PLUGINADMIN.php | 4 ++-- nucleus/libs/SEARCH.php | 2 +- nucleus/libs/SKIN.php | 4 ++-- nucleus/libs/TEMPLATE.php | 4 ++-- nucleus/libs/backup.php | 4 ++-- nucleus/libs/globalfunctions.php | 4 ++-- nucleus/libs/showlist.php | 4 ++-- nucleus/libs/skinie.php | 4 ++-- nucleus/libs/sql/mysql.php | 4 ++-- nucleus/libs/sql/pdo.php | 4 ++-- nucleus/libs/vars4.1.0.php | 4 ++-- nucleus/locales/en_Latn_US.ISO-8859-1.php | 2 +- nucleus/locales/en_Latn_US.UTF-8.php | 2 +- nucleus/locales/ja_Jpan_JP.EUC-JP.php | 4 ++-- nucleus/locales/ja_Jpan_JP.UTF-8.php | 2 +- nucleus/media.php | 4 ++-- nucleus/upgrades/index.php | 4 ++-- nucleus/upgrades/upgrade.functions.php | 4 ++-- nucleus/upgrades/upgrade.php | 4 ++-- nucleus/upgrades/upgrade0.95.php | 4 ++-- nucleus/upgrades/upgrade0.96.php | 4 ++-- nucleus/upgrades/upgrade1.0.php | 4 ++-- nucleus/upgrades/upgrade1.1.php | 4 ++-- nucleus/upgrades/upgrade1.5.php | 4 ++-- nucleus/upgrades/upgrade2.0.php | 4 ++-- nucleus/upgrades/upgrade2.5.php | 4 ++-- nucleus/upgrades/upgrade3.0.php | 4 ++-- nucleus/upgrades/upgrade3.1.php | 4 ++-- nucleus/upgrades/upgrade3.2.php | 4 ++-- nucleus/upgrades/upgrade3.3.php | 4 ++-- nucleus/upgrades/upgrade3.4.php | 4 ++-- nucleus/upgrades/upgrade3.5.php | 4 ++-- nucleus/upgrades/upgrade3.6.php | 4 ++-- nucleus/upgrades/upgrade4.0.php | 4 ++-- nucleus/xmlrpc/api_blogger.inc.php | 4 ++-- nucleus/xmlrpc/api_metaweblog.inc.php | 4 ++-- nucleus/xmlrpc/api_mt.inc.php | 4 ++-- nucleus/xmlrpc/api_nucleus.inc.php | 4 ++-- nucleus/xmlrpc/server.php | 4 ++-- xml-rss2.php | 4 ++-- 73 files changed, 155 insertions(+), 155 deletions(-) diff --git a/action.php b/action.php index 8c9cbff..63abbb6 100644 --- a/action.php +++ b/action.php @@ -1,7 +1,7 @@ getDefinedActions(),$actions); $actions->setTemplate($template); $actions->setParser($parser); - $item = Item::getitem($itemid, 0, 0); + $item = Item::getitem($itemid, 0, 0); $actions->setCurrentItem($item); $comments = new Comments($itemid); diff --git a/nucleus/libs/ADMIN.php b/nucleus/libs/ADMIN.php index a4d12cf..f5079b0 100644 --- a/nucleus/libs/ADMIN.php +++ b/nucleus/libs/ADMIN.php @@ -1,7 +1,7 @@ notify('PreDateFoot',array('blog' => &$this, 'timestamp' => $oldTS)); - - if ( !in_array('DATE_FOOTER', $template) || !empty($template['DATE_FOOTER']) ) - { - $tmp_footer = i18n::formatted_datetime('', $oldTS); - } - else - { - $tmp_footer = i18n::formatted_datetime($template['DATE_FOOTER'], $oldTS); - } + + if ( !in_array('DATE_FOOTER', $template) || !empty($template['DATE_FOOTER']) ) + { + $tmp_footer = i18n::formatted_datetime('', $oldTS); + } + else + { + $tmp_footer = i18n::formatted_datetime($template['DATE_FOOTER'], $oldTS); + } $parser->parse($tmp_footer); $manager->notify('PostDateFoot',array('blog' => &$this, 'timestamp' => $oldTS)); } @@ -241,7 +241,7 @@ class Blog { $tmp_footer = i18n::formatted_datetime($template['DATE_FOOTER'], $timestamp); } - + $parser->parse($tmp_header); $manager->notify('PostDateHead',array('blog' => &$this, 'timestamp' => $timestamp)); } @@ -755,7 +755,7 @@ class Blog ); $temp = Template::fill($template['ARCHIVELIST_LISTITEM'],$data); - echo i18n::formatted_datetime($temp, $current->itime); + echo i18n::formatted_datetime($temp, $current->itime); return; } diff --git a/nucleus/libs/BODYACTIONS.php b/nucleus/libs/BODYACTIONS.php index 14e9e27..f7d36ae 100644 --- a/nucleus/libs/BODYACTIONS.php +++ b/nucleus/libs/BODYACTIONS.php @@ -2,7 +2,7 @@ /* * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/) - * Copyright (C) 2002-2009 The Nucleus Group + * Copyright (C) 2002-2012 The Nucleus Group * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -14,7 +14,7 @@ * A class to parses plugin calls inside items * * @license http://nucleuscms.org/license.txt GNU General Public License - * @copyright Copyright (C) 2002-2009 The Nucleus Group + * @copyright Copyright (C) 2002-2012 The Nucleus Group * @version $Id: BODYACTIONS.php 1626 2012-01-09 15:46:54Z sakamocchi $ */ diff --git a/nucleus/libs/BaseActions.php b/nucleus/libs/BaseActions.php index 2766229..8183375 100644 --- a/nucleus/libs/BaseActions.php +++ b/nucleus/libs/BaseActions.php @@ -1,7 +1,7 @@ getCorrectTime(); - } - else - { - $posttime = 0; + if ( !$i_draft ) + { + $posttime = $blog->getCorrectTime(); } - } + else + { + $posttime = 0; + } + } if ( $posttime > $blog->getCorrectTime() ) { diff --git a/nucleus/libs/ITEMACTIONS.php b/nucleus/libs/ITEMACTIONS.php index 57bf2c6..64bfb92 100644 --- a/nucleus/libs/ITEMACTIONS.php +++ b/nucleus/libs/ITEMACTIONS.php @@ -1,7 +1,7 @@