CHANGE:クエリ生成に使われているi18n::formatted_datetime()をDB::formatDateTime()に変更

diff --git a/nucleus/libs/ADMIN.php b/nucleus/libs/ADMIN.php
index 401a766..ad4b6b4 100644 (file)
--- a/nucleus/libs/ADMIN.php
+++ b/nucleus/libs/ADMIN.php
@@ -1511,7 +1511,7 @@ class Admin
                $currenttime = $blog->getCorrectTime(time());
                
                $query = "SELECT * FROM %s WHERE iblog=%d AND iposted=0 AND itime>'%s'";
-               $query = sprintf($query, sql_table('item'), (integer) $blogid, i18n::formatted_datetime('mysql', $currenttime));
+               $query = sprintf($query, sql_table('item'), (integer) $blogid, DB::formatDateTime($currenttime));
                $result = DB::getResult($query);
                
                if ( $result->rowCount() > 0 )

diff --git a/nucleus/libs/BLOG.php b/nucleus/libs/BLOG.php
index 0cb7343..c0e33f0 100644 (file)
--- a/nucleus/libs/BLOG.php
+++ b/nucleus/libs/BLOG.php
@@ -99,7 +99,7 @@ class Blog
                        $timestamp_end = mktime(0,0,0,$month,$day+1,$year);\r
                }\r
                $extra_query = " and i.itime>='%s' and i.itime<'%s'";\r
-               $extra_query = sprintf($extra_query, i18n::formatted_datetime('mysql', $timestamp_start), i18n::formatted_datetime('mysql', $timestamp_end));\r
+               $extra_query = sprintf($extra_query, DB::formatDateTime($timestamp_start), DB::formatDateTime($timestamp_end));\r
                \r
                $this->readLogAmount($templatename,0,$extra_query,'',1,1);\r
                return;\r
@@ -575,7 +575,7 @@ class Blog
                                . ' and i.idraft=0'\r
                                . $selectblogs\r
                                        // don't show future items\r
-                               . ' and i.itime<="' . i18n::formatted_datetime('mysql', $this->getCorrectTime()) . '"'\r
+                               . ' and i.itime<="' . DB::formatDateTime($this->getCorrectTime()) . '"'\r
                                . ' and '.$where;\r
 \r
                // take into account amount of months to search\r
@@ -583,7 +583,7 @@ class Blog
                {\r
                        $localtime = getdate($this->getCorrectTime());\r
                        $timestamp_start = mktime(0,0,0,$localtime['mon'] - $amountMonths,1,$localtime['year']);\r
-                       $query .= ' and i.itime>"' . i18n::formatted_datetime('mysql', $timestamp_start) . '"';\r
+                       $query .= ' and i.itime>"' . DB::formatDateTime($timestamp_start) . '"';\r
                }\r
                \r
                if ( $mode == '' )\r
@@ -630,7 +630,7 @@ class Blog
                                // exclude drafts\r
                                . ' and i.idraft=0'\r
                                // don't show future items\r
-                               . ' and i.itime<="' . i18n::formatted_datetime('mysql', $this->getCorrectTime()) . '"';\r
+                               . ' and i.itime<="' . DB::formatDateTime($this->getCorrectTime()) . '"';\r
                \r
                if ( $this->getSelectedCategory() )\r
                {\r
@@ -687,7 +687,7 @@ class Blog
                                . ' FROM '.sql_table('item')\r
                                . ' WHERE iblog=' . $this->getID()\r
                                // don't show future items!\r
-                               . ' AND itime <="' . i18n::formatted_datetime('mysql', $this->getCorrectTime()) . '"'\r
+                               . ' AND itime <="' . DB::formatDateTime($this->getCorrectTime()) . '"'\r
                                // don't show draft items\r
                                . ' AND idraft=0';\r
                \r
@@ -1581,7 +1581,7 @@ class Blog
                        if ( !$showFuture )\r
                        {\r
                                // don't show future items\r
-                               $query .= " and i.itime<='" . i18n::formatted_datetime('mysql', $this->getCorrectTime()) . "'";\r
+                               $query .= " and i.itime<='" . DB::formatDateTime($this->getCorrectTime()) . "'";\r
                        }\r
                        \r
                        $query .= ' and i.inumber='.intval($value);\r

diff --git a/nucleus/libs/ITEM.php b/nucleus/libs/ITEM.php
index 20ce0fb..105a247 100644 (file)
--- a/nucleus/libs/ITEM.php
+++ b/nucleus/libs/ITEM.php
@@ -98,7 +98,7 @@ class Item
                if ( !$allow_future )\r
                {\r
                        $blog =& $manager->getBlog(getBlogIDFromItemID($item_id));\r
-                       $query .= "AND i.itime <= '" . i18n::formatted_datetime('mysql', $blog->getCorrectTime()) ."'";\r
+                       $query .= "AND i.itime <= '" . DB::formatDateTime($blog->getCorrectTime()) ."'";\r
                }\r
                \r
                $query .= ' LIMIT 1';\r
@@ -361,13 +361,13 @@ class Item
                {\r
                        $query .= ', idraft = 1';\r
                        // set timestamp back to zero for a draft\r
-                       $query .= ", itime = '" . i18n::formatted_datetime('mysql', $timestamp) ."'";\r
+                       $query .= ", itime = '" . DB::formatDateTime($timestamp) ."'";\r
                }\r
                \r
                // update timestamp when needed\r
                if ( $timestamp != 0 )\r
                {\r
-                       $query .= ", itime = '" . i18n::formatted_datetime('mysql', $timestamp) ."'";\r
+                       $query .= ", itime = '" . DB::formatDateTime($timestamp) ."'";\r
                }\r
                \r
                // make sure the correct item is updated\r
@@ -514,7 +514,7 @@ class Item
                                return 0;\r
                        }\r
                        $blog =& $manager->getBlog($blogid);\r
-                       $query .= " and itime<='" . i18n::formatted_datetime('mysql', $blog->getCorrectTime()) ."'";\r
+                       $query .= " and itime<='" . DB::formatDateTime($blog->getCorrectTime()) ."'";\r
                }\r
                if ( !$draft )\r
                {\r

diff --git a/nucleus/libs/globalfunctions.php b/nucleus/libs/globalfunctions.php
index b9449de..79fdde8 100644 (file)
--- a/nucleus/libs/globalfunctions.php
+++ b/nucleus/libs/globalfunctions.php
@@ -2145,7 +2145,7 @@ function formatDate($format, $timestamp, $default_format, &$blog)
 /* NOTE: use i18n::formatted_datetime() directly instead of this */\r
 function mysqldate($timestamp)\r
 {\r
-       return '"' . i18n::formatted_datetime('mysql', $timestamp) . '"';\r
+       return '"' . DB::formatDateTime($timestamp) . '"';\r
  }\r
 /**\r
  * Centralisation of the functions that generate links\r