Merge branch 'skinnable-master' of ssh://shizuki@git.sourceforge.jp/gitroot/nucleus...

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

diff --git a/nucleus/libs/COMMENTACTIONS.php b/nucleus/libs/COMMENTACTIONS.php
index b41870d..dd469f0 100644 (file)
--- a/nucleus/libs/COMMENTACTIONS.php
+++ b/nucleus/libs/COMMENTACTIONS.php
@@ -404,8 +404,8 @@ class CommentActions extends BaseActions
        {\r
                $data = array(\r
                        'itemid'        => $this->commentsObj->itemid,\r
-                       'timestamp'     => $this->commentsObj->itemActions->currentItem->timestamp,\r
-                       'title'         => $this->commentsObj->itemActions->currentItem->title,\r
+                       'timestamp'     => $this->commentsObj->itemActions->currentItem['timestamp'],\r
+                       'title'         => $this->commentsObj->itemActions->currentItem['title'],\r
                        'extra'         => $this->commentsObj->itemActions->linkparams\r
                );\r
                \r
@@ -641,7 +641,7 @@ class CommentActions extends BaseActions
         */\r
        public function parse_userlinkraw()\r
        {\r
-               echo $this->currentComment['userlinkraw'];\r
+               echo (array_key_exists('userlinkraw', $this->currentComment) && !empty($this->currentComment['userlinkraw'])) ? $this->currentComment['userlinkraw'] : '';\r
                return;\r
        }\r
        \r
@@ -682,7 +682,7 @@ class CommentActions extends BaseActions
        }\r
        \r
        /**\r
-        * ItemActions::checkCondition()\r
+        * CommentActions::checkCondition()\r
         * Checks conditions for if statements\r
         *\r
         * @param       string  $field  type of <%if%>\r