MERGE: リビジョン1758〜1766までのマージと。form用テンプレートに使えるタグ種の変更

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

diff --git a/nucleus/libs/BODYACTIONS.php b/nucleus/libs/BODYACTIONS.php
index 28e0c31..fc93e82 100644 (file)
--- a/nucleus/libs/BODYACTIONS.php
+++ b/nucleus/libs/BODYACTIONS.php
@@ -28,12 +28,6 @@ class BodyActions extends BaseActions
                'media',\r
                'popup',\r
                'plugin',\r
-               'if',\r
-               'else',\r
-               'endif',\r
-               'elseif',\r
-               'ifnot',\r
-               'elseifnot'\r
        );\r
        \r
        /**\r
@@ -45,7 +39,7 @@ class BodyActions extends BaseActions
         */\r
        public function __construct()\r
        {\r
-               $this->initialize();    \r
+               parent::__construct();  
                return;\r
        }\r
        \r
@@ -81,12 +75,13 @@ class BodyActions extends BaseActions
         * BodyActions::getDefinedActions()\r
         * Get the defined actions in an item\r
         * \r
+        * @static
         * @param       void\r
         * @return      Array   self::$defined_actions\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
@@ -164,7 +159,7 @@ class BodyActions extends BaseActions
                $vars['height']                 = $height;\r
                $vars['media']                  = '<a href="' . $vars['link'] . '">' . $vars['text'] . '</a>';\r
                \r
-               return Template::fill($this->template['IMAGE_CODE'],$vars);;\r
+               return Template::fill($this->template['IMAGE_CODE'], $vars);
        }\r
        \r
        /**\r