MERGE: リビジョン1818。Parserクラスのコンストラクタを変更。BaseActions派生クラスのメソッド名を変更

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

diff --git a/nucleus/libs/BODYACTIONS.php b/nucleus/libs/BODYACTIONS.php
index e26b1ae..137af90 100644 (file)
--- a/nucleus/libs/BODYACTIONS.php
+++ b/nucleus/libs/BODYACTIONS.php
@@ -44,6 +44,18 @@ class BodyActions extends BaseActions
        }
        
        /**
+        * BodyActions::getAvailableActions()
+        * Get the defined actions in an item
+        * 
+        * @param       void
+        * @return      array   self::$defined_actions
+        */
+       public function getAvailableActions()
+       {
+               return array_merge(self::$defined_actions, parent::getAvailableActions());
+       }
+       
+       /**
         * BodyActions::setCurrentItem()
         * Set the current item
         * 
@@ -72,19 +84,6 @@ class BodyActions extends BaseActions
        }
        
        /**
-        * BodyActions::getDefinedActions()
-        * Get the defined actions in an item
-        * 
-        * @static
-        * @param       void
-        * @return      Array   self::$defined_actions
-        */
-       static public function getDefinedActions()
-       {
-               return array_merge(self::$defined_actions, parent::getDefinedActions());
-       }
-       
-       /**
         * BodyActions::parse_plugin()
         * Parse a plugin var
         * Called if <%plugin(...)%> in an item appears