いくつかのstandardsエラーの修正

diff --git a/nucleus/libs/AdminActions.php b/nucleus/libs/AdminActions.php
index 1446c84..73b1b08 100644 (file)
--- a/nucleus/libs/AdminActions.php
+++ b/nucleus/libs/AdminActions.php
@@ -1714,10 +1714,10 @@ class AdminActions extends BaseActions
         * AdminActions::parse_commentnavlist()
         * Parse skinvar commentnavlist
         *
-        * @param       void
+        * @param       string  $template_name  name of template to use
         * @return      void
         */
-       public function parse_commentnavlist()
+       public function parse_commentnavlist($template_name = '')
        {
                global $CONF, $manager, $member;
                
@@ -1797,7 +1797,8 @@ class AdminActions extends BaseActions
                                
                        $template['content'] = 'commentlist';
                                
-                       $this->parser->parse(listplug_navlist('comment', $resource, 'table', $template));
+                       $navlist = listplug_navlist('comment', $resource, 'table', $template, $template_name);
+                       $this->parser->parse($navlist);
                }
                else
                {
@@ -3225,10 +3226,10 @@ class AdminActions extends BaseActions
         * AdminActions::parse_itemnavlist()
         * Parse skinvar itemnavlist
         *
-        * @param       void
+        * @param       string  $template_name  name of template to use
         * @return      void
         */
-       public function parse_itemnavlist($template_name)
+       public function parse_itemnavlist($template_name = '')
        {
                global $CONF, $manager, $member;
                
@@ -3319,7 +3320,8 @@ class AdminActions extends BaseActions
                                
                        $template['content'] = 'itemlist';
                                
-                       $this->parser->parse(listplug_navlist('item', $query, 'table', $template, $template_name));
+                       $navlist = listplug_navlist('item', $query, 'table', $template, $template_name);
+                       $this->parser->parse($navlist);
                }
                else
                {
@@ -3904,7 +3906,8 @@ class AdminActions extends BaseActions
                $template['shortenel']  = '';
                $template['javascript'] = 'onchange="return form.submit()"';
                
-               $this->parser->parse(showlist($query, 'select', $template, $template_name));
+               $selectlist = showlist($query, 'select', $template, $template_name);
+               $this->parser->parse($selectlist);
                
                return;
        }
@@ -4571,7 +4574,8 @@ class AdminActions extends BaseActions
                        $template['content']    = 'bloglist';
                        $template['superadmin'] = $member->isAdmin();
                                
-                       $this->parser->parse(showlist($resource, 'table', $template, $template_name));
+                       $list_resource_table = showlist($resource, 'table', $template, $template_name);
+                       $this->parser->parse($list_resource_table);
                        $resource->closeCursor();
                                
                        echo '<h2>' . _OVERVIEW_YRDRAFTS . '</h2>';

diff --git a/nucleus/libs/MANAGER.php b/nucleus/libs/MANAGER.php
index ea9a5ad..95c2674 100644 (file)
--- a/nucleus/libs/MANAGER.php
+++ b/nucleus/libs/MANAGER.php
@@ -194,7 +194,8 @@ class Manager
                if ( !array_key_exists($templateName, $this->templates) )\r
                {\r
                        $this->_loadClass('Template','TEMPLATE.php');\r
-                       $this->templates[$templateName] =& Template::read($templateName);\r
+                       $tmplate_tmp = Template::read($templateName);\r
+                       $this->templates[$templateName] =& $tmplate_tmp;\r
                }\r
                return $this->templates[$templateName];\r
        }\r