FIX:コメント取得のクエリに必要なスペースがないために発生するクエリエラーを修正

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

diff --git a/nucleus/libs/ITEMACTIONS.php b/nucleus/libs/ITEMACTIONS.php
index 1fe2c06..cfce878 100644 (file)
--- a/nucleus/libs/ITEMACTIONS.php
+++ b/nucleus/libs/ITEMACTIONS.php
@@ -1,7 +1,7 @@
 <?php\r
 /*\r
  * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)\r
- * Copyright (C) 2002-2012 The Nucleus Group\r
+ * Copyright (C) 2002-2009 The Nucleus Group\r
  *\r
  * This program is free software; you can redistribute it and/or\r
  * modify it under the terms of the GNU General Public License\r
@@ -13,8 +13,8 @@
  * This class is used to parse item templates\r
  *\r
  * @license http://nucleuscms.org/license.txt GNU General Public License\r
- * @copyright Copyright (C) 2002-2012 The Nucleus Group\r
- * @version $Id: ITEMACTIONS.php 1699 2012-03-10 15:46:32Z sakamocchi $\r
+ * @copyright Copyright (C) 2002-2009 The Nucleus Group\r
+ * @version $Id: ITEMACTIONS.php 1757 2012-04-15 09:02:32Z sakamocchi $\r
  */\r
 class ItemActions extends BaseActions\r
 {\r
@@ -47,7 +47,7 @@ class ItemActions extends BaseActions
         * ItemActions::$blog\r
         * reference to the blog currently being displayed\r
         */\r
-       private $blog;\r
+       public $blog;
        \r
        /**\r
         * ItemActions::$template\r
@@ -66,53 +66,42 @@ class ItemActions extends BaseActions
         * defined actions in this class\r
         */\r
        static private $defined_actions = array(\r
+               'author',
+               'authorid',
+               'authorlink',
                'blogid',\r
-               'title',\r
+               'blogurl',
                'body',\r
-               'more',\r
-               'smartbody',\r
-               'itemid',\r
-               'morelink',\r
                'category',\r
                'categorylink',\r
-               'author',\r
-               'authorid',\r
-               'authorlink',\r
                'catid',\r
-               'karma',\r
+               'closed',
+               'comments',
                'date',\r
-               'time',\r
-               'query',\r
+               'daylink',
+               'edit',
+               'editlink',
+               'editpopupcode',
+               'itemid',
                'itemlink',\r
-               'blogurl',\r
-               'closed',\r
-               'syndicate_title',\r
-               'syndicate_description',\r
+               'karma',
+               'karmaneglink',
                'karmaposlink',\r
-               'karmaneglink',\r
+               'more',
+               'morelink',
                'new',\r
+               'plugin',
+               'query',
+               'relevance',
+               'smartbody',
+               'syndicate_description',
+               'syndicate_title',
+               'time',
+               'title',
+       /* actions defined in BodyAction class */
                'image',\r
+               'media',
                'popup',\r
-               'media',\r
-               'daylink',\r
-               'query',\r
-               'include',\r
-               'phpinclude',\r
-               'parsedinclude',\r
-               'skinfile',\r
-               'set',\r
-               'plugin',\r
-               'edit',\r
-               'editlink',\r
-               'editpopupcode',\r
-               'comments',\r
-               'relevance',\r
-               'if',\r
-               'else',\r
-               'endif',\r
-               'elseif',\r
-               'ifnot',\r
-               'elseifnot'\r
        );\r
        \r
        /**\r
@@ -124,7 +113,7 @@ class ItemActions extends BaseActions
        {\r
                global $catid, $member;\r
                // call constructor of superclass first\r
-               $this->BaseActions();\r
+               parent::__construct();
                \r
                // extra parameters for created links\r
                if ( $catid )\r
@@ -143,12 +132,13 @@ class ItemActions extends BaseActions
         * Returns an array with the actions that are defined\r
         * in the ItemActions class\r
         * \r
+        * @static
         * @param       void\r
         * @return      void\r
         */\r
-       public function getDefinedActions()\r
+       static public function getDefinedActions()
        {\r
-               return self::$defined_actions;\r
+               return array_merge(self::$defined_actions, parent::getDefinedActions());
        }\r
        \r
        /**\r