FIX: コメントの編集・削除、アクセス禁止の追加と削除が行えないバグの修正

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

diff --git a/nucleus/libs/AdminActions.php b/nucleus/libs/AdminActions.php
index 15b0441..ff3c888 100644 (file)
--- a/nucleus/libs/AdminActions.php
+++ b/nucleus/libs/AdminActions.php
@@ -1494,12 +1494,13 @@ class AdminActions extends BaseActions
        public function parse_banlistdeletedlist($templateName = '')
        {
                global $manager;
-               $templates = array();
                
+               $templates = array();
                if ( $templateName )
                {
                        $templates = Template::read($templateName);
                }
+               
                if ( !array_key_exists('BANLIST_DELETED_LIST', $templates) || empty($templates['BANLIST_DELETED_LIST']) )
                {
                        $template = "<li><%blogname%></li>\n";
@@ -1514,10 +1515,11 @@ class AdminActions extends BaseActions
                {
                        $blog =& $manager->getBlog($delblog);
                        $data =  array(
-                               Entity::hsc($blog->getName())
+                               'blogname' => Entity::hsc($blog->getName())
                        );
-                       Template::fill($template, $data);
+                       echo Template::fill($template, $data);
                }
+               
                return;
        }
        
@@ -2734,6 +2736,13 @@ class AdminActions extends BaseActions
                                $comment['body'] = str_replace('<br />', '', $comment['body']);
                                $comment['body'] = preg_replace("#<a href=['\"]([^'\"]+)['\"]( rel=\"nofollow\")?>[^<]*</a>#", "\\1", $comment['body']);
                                echo $comment['body'];
+                               break;
+                       case 'cmail':
+                               echo $comment['userid'];
+                               break;
+                       case 'url':
+                               echo $comment['userid'];
+                               break;
                        default:
                                echo $comment[$type];
                                break;
@@ -3380,7 +3389,7 @@ class AdminActions extends BaseActions
         */
        public function parse_getblogsetting($which)
        {
-               global $blog;
+               global $blog, $manager;
                
                if ( $blog )
                {
@@ -3388,7 +3397,6 @@ class AdminActions extends BaseActions
                }
                elseif ( $bid = intRequestVar('blogid') )
                {
-                       global $manager;
                        $b = $manager->getBlog($bid);
                }
                else