FIX:メンバーごとの管理エリア用スキンが反映されていなかったので修正

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

diff --git a/nucleus/libs/ACTIONS.php b/nucleus/libs/ACTIONS.php
index 61d4930..8e86f6f 100644 (file)
--- a/nucleus/libs/ACTIONS.php
+++ b/nucleus/libs/ACTIONS.php
@@ -15,7 +15,7 @@
  *\r
  * @license http://nucleuscms.org/license.txt GNU General Public License\r
  * @copyright Copyright (C) 2002-2012 The Nucleus Group\r
- * @version $Id: ACTIONS.php 1784 2012-04-22 04:28:30Z sakamocchi $\r
+ * @version $Id: ACTIONS.php 1863 2012-05-19 10:50:27Z sakamocchi $
  */\r
 \r
 class Actions extends BaseActions\r
@@ -427,7 +427,7 @@ class Actions extends BaseActions
                }\r
                \r
                // check category name\r
-               if ( $name == 'catname' )\r
+               else if ( $name == 'catname' )
                {\r
                        $value = $blog->getCategoryIdFromName($value);\r
                        if ( $value == $catid )\r
@@ -437,7 +437,7 @@ class Actions extends BaseActions
                }\r
                \r
                // check category id\r
-               if ( ($name == 'catid') && ($value == $catid) )\r
+               else if ( ($name == 'catid') && ($value == $catid) )
                {\r
                        return $blog->isValidCategory($catid);\r
                }\r
@@ -554,8 +554,8 @@ class Actions extends BaseActions
                // TODO: Move request uri to linkparams. this is ugly. sorry for that.\r
                $startpos       = (integer) $startpos;\r
                $parsed         = parse_url(serverVar('REQUEST_URI'));\r
-               $path           = $parsed['path'];\r
-               $parsed         = $parsed['query'];\r
+               $path           = ( in_array('path', $parsed) ) ? $parsed['path'] : '';\r
+               $parsed         = ( in_array('query', $parsed) ) ? $parsed['query'] : '';\r
                $url            = '';\r
                \r
                if ( $direction == 'prev' )\r
@@ -572,7 +572,7 @@ class Actions extends BaseActions
                                {\r
                                        $url = $CONF['SearchURL'];\r
                                }\r
-                               $url .= '?' . alterQueryStr($parsed,'startpos',$startpos);\r
+                               $url .= '?' . alterQueryStr($parsed, 'startpos', $startpos);\r
                        }\r
                }\r
                else if ( $direction == 'next' )\r
@@ -1220,10 +1220,10 @@ class Actions extends BaseActions
         */\r
        public function parse_comments($template)\r
        {\r
-               global $itemid, $manager, $blog, $highlight;\r
+               global $manager, $blog, $highlight, $itemid;\r
                \r
                $template =& $manager->getTemplate($template);\r
-               $item = Item::getitem($itemid, 0, 0);\r
+               $item =& $manager->getitem($itemid, 0, 0);\r
                \r
                // create parser object & action handler\r
                $handler = new ItemActions($blog);\r
@@ -1424,7 +1424,7 @@ class Actions extends BaseActions
        public function parse_itemtitle($format = '')\r
        {\r
                global $manager, $itemid;\r
-               $item =& $manager->getItem($itemid,0,0);\r
+               $item =& $manager->getItem($itemid, 1, 1);\r
                \r
                switch ( $format )\r
                {\r
@@ -2206,17 +2206,19 @@ class Actions extends BaseActions
         * @param       string  $template       name of template\r
         * @return      void\r
         */\r
-       public function parse_sticky($itemnumber = 0, $template = '')\r
+       public function parse_sticky($itemid = 0, $template = '')\r
        {\r
                global $manager;\r
                \r
-               $itemnumber = intval($itemnumber);\r
-               $itemarray = array($itemnumber);\r
+               $itemid = (integer) $itemid;\r
+               $itemarray = array($itemid);\r
+               \r
+               $item =& $manager->getItem($post['itemid'], 1, 1);\r
+               $blog =& $manager->getBlog($item['blogid']);\r
                \r
-               $b =& $manager->getBlog(getBlogIDFromItemID($itemnumber));\r
-               $this->preBlogContent('sticky',$b);\r
-               $this->amountfound = $b->readLogFromList($itemarray, $template);\r
-               $this->postBlogContent('sticky',$b);\r
+               $this->preBlogContent('sticky', $blog);\r
+               $this->amountfound = $blog->readLogFromList($itemarray, $template);\r
+               $this->postBlogContent('sticky', $blog);\r
                return;\r
        }\r
 }\r