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

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

diff --git a/nucleus/libs/COMMENTACTIONS.php b/nucleus/libs/COMMENTACTIONS.php
index 22cc3cf..b320145 100644 (file)
--- a/nucleus/libs/COMMENTACTIONS.php
+++ b/nucleus/libs/COMMENTACTIONS.php
@@ -88,27 +88,14 @@ class CommentActions extends BaseActions
        }
        
        /**
-        * CommentActions::getDefinedActions()
+        * CommentActions::getAvailableActions()
         * 
-        * @static
         * @param       void
         * @return array        actions array
         */
-       static public function getDefinedActions()
+       public function getAvailableActions()
        {
-               return array_merge(self::$defined_actions, parent::getDefinedActions());
-       }
-       
-       /**
-        * CommentActions::setParser()
-        * 
-        * @param       object  $parser instance of Parser class
-        * @return      void
-        */
-       public function setParser(&$parser)
-       {
-               $this->parser =& $parser;
-               return;
+               return array_merge(self::$defined_actions, parent::getAvailableActions());
        }
        
        /**
@@ -417,8 +404,8 @@ class CommentActions extends BaseActions
        {
                $data = array(
                        'itemid'        => $this->commentsObj->itemid,
-                       'timestamp'     => $this->commentsObj->itemActions->currentItem->timestamp,
-                       'title'         => $this->commentsObj->itemActions->currentItem->title,
+                       'timestamp'     => $this->commentsObj->itemActions->currentItem['timestamp'],
+                       'title'         => $this->commentsObj->itemActions->currentItem['title'],
                        'extra'         => $this->commentsObj->itemActions->linkparams
                );
                
@@ -695,7 +682,7 @@ class CommentActions extends BaseActions
        }
        
        /**
-        * ItemActions::checkCondition()
+        * CommentActions::checkCondition()
         * Checks conditions for if statements
         *
         * @param       string  $field  type of <%if%>