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

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

diff --git a/nucleus/libs/ITEMACTIONS.php b/nucleus/libs/ITEMACTIONS.php
index 333dd81..b1de395 100644 (file)
--- a/nucleus/libs/ITEMACTIONS.php
+++ b/nucleus/libs/ITEMACTIONS.php
@@ -847,8 +847,9 @@ class ItemActions extends BaseActions
                                $condition = ($blog && ($blog->getSetting($name) == $value));\r
                                break;\r
                        case 'itemblogsetting':\r
-                               $b =& $manager->getBlog(getBlogIDFromItemID($this->currentItem['itemid']));\r
-                               $condition = ($b && ($b->getSetting($name) == $value));\r
+                               $item =& $manager->getItem($this->currentItem['itemid'], 1, 1);\r
+                               $t_blog =& $manager->getBlog($item['blogid']);\r
+                               $condition = ($t_blog && ($t_blog->getSetting($name) == $value));\r
                                break;\r
                        case 'loggedin':\r
                                $condition = $member->isLoggedIn();\r
@@ -920,8 +921,6 @@ class ItemActions extends BaseActions
        {\r
                global $member, $manager;\r
                \r
-               $b =& $manager->getBlog(getBlogIDFromItemID($this->currentItem['itemid']));\r
-               \r
                // when no parameter is defined, just check if author is current visitor\r
                if ( ($key != 'isadmin' && $key != 'name') || ($key == 'name' && $value == '') )\r
                {\r
@@ -941,14 +940,12 @@ class ItemActions extends BaseActions
                // check if author is admin\r
                if ( ($key == 'isadmin') )\r
                {\r
-                       $aid = intval($this->currentItem['authorid']);\r
-                       $blogid = intval($b->getID());                  \r
-                       $amember =& $manager->getMember($aid);\r
-                       if ( $amember->isAdmin() )\r
+                       $i_author =& $manager->getMember($this->currentItem['authorid']);\r
+                       if ( $i_author->isAdmin() )\r
                        {\r
                                return TRUE;\r
                        }\r
-                       return (boolean) $amember->isBlogAdmin($blogid);\r
+                       return (boolean) $i_author->isBlogAdmin($this->currentItem['blogid']);\r
                }\r
                \r
                return FALSE;\r
@@ -966,12 +963,12 @@ class ItemActions extends BaseActions
        {\r
                global $catid, $manager;\r
                \r
-               $b =& $manager->getBlog(getBlogIDFromItemID($this->currentItem['itemid']));\r
+               $blog =& $manager->getBlog($this->currentItem['blogid']);\r
                \r
                // when no parameter is defined, just check if a category is selected\r
                if ( ($key != 'catname' && $key != 'catid') || ($value == '') )\r
                {\r
-                       return (boolean) $b->isValidCategory($catid);\r
+                       return (boolean) $blog->isValidCategory($catid);\r
                }\r
                \r
                $icatid = $this->currentItem['catid'];\r
@@ -979,17 +976,17 @@ class ItemActions extends BaseActions
                // check category name\r
                if ( $key == 'catname' )\r
                {\r
-                       $value = $b->getCategoryIdFromName($value);\r
+                       $value = $blog->getCategoryIdFromName($value);\r
                        if ( $value == $icatid )\r
                        {\r
-                               return (boolean) $b->isValidCategory($icatid);\r
+                               return (boolean) $blog->isValidCategory($icatid);\r
                        }\r
                }\r
                \r
                // check category id\r
                if ( ($key == 'catid') && ($value == $icatid) )\r
                {\r
-                       return (boolean) $b->isValidCategory($icatid);\r
+                       return (boolean) $blog->isValidCategory($icatid);\r
                }\r
                return FALSE;\r
        }\r