CHANGE: getBlogIDFromItemID()を使わずにManager::getItem()を使うよう変更

[nucleus-jp/nucleus-next.git] / nucleus / libs / ITEM.php

diff --git a/nucleus/libs/ITEM.php b/nucleus/libs/ITEM.php
index 9de8eb4..602234f 100644 (file)
--- a/nucleus/libs/ITEM.php
+++ b/nucleus/libs/ITEM.php
@@ -97,6 +97,7 @@ class Item
                \r
                if ( !$allow_future )\r
                {\r
+                       /* FIXME: should be rewritten! */\r
                        $blog =& $manager->getBlog(getBlogIDFromItemID($item_id));\r
                        $query .= 'AND i.itime <= ' . DB::formatDateTime($blog->getCorrectTime());\r
                }\r
@@ -104,16 +105,13 @@ class Item
                $query .= ' LIMIT 1';\r
                $result = DB::getResult($query);\r
                \r
-               if ( $result->rowCount() == 1 )\r
-               {\r
-                       $aItemInfo = $result->fetch(PDO::FETCH_ASSOC);\r
-                       $aItemInfo['timestamp'] = strtotime($aItemInfo['itime']);\r
-                       return $aItemInfo;\r
-               }\r
-               else\r
+               if ( $result->rowCount() != 1 )\r
                {\r
                        return 0;\r
                }\r
+               $aItemInfo = $result->fetch(PDO::FETCH_ASSOC);\r
+               $aItemInfo['timestamp'] = strtotime($aItemInfo['itime']);\r
+               return $aItemInfo;\r
        }\r
        \r
        /**\r
@@ -504,7 +502,7 @@ class Item
                global $manager;\r
                \r
                $itemid = (integer) $itemid;\r
-               $query = 'select * FROM '.sql_table('item').' WHERE inumber='.$itemid;\r
+               $query = 'SELECT * FROM '.sql_table('item').' WHERE inumber='.$itemid;\r
                \r
                if ( !$future )\r
                {\r
@@ -558,7 +556,8 @@ class Item
                if ( $type == 'edit' )\r
                {\r
                        $itemid = intPostVar('itemid');\r
-                       $i_blogid = getBlogIDFromItemID($itemid);\r
+                       $item =& $manager->getItem($itemid, 0, 0);\r
+                       $i_blogid = $item['blogid'];\r
                }\r
                else\r
                {\r