FIX: リファレンスにまつわるコードを修正

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

diff --git a/nucleus/libs/ADMIN.php b/nucleus/libs/ADMIN.php
index ce8d931..8ecdb28 100644 (file)
--- a/nucleus/libs/ADMIN.php
+++ b/nucleus/libs/ADMIN.php
@@ -813,7 +813,7 @@ class Admin
                
                $item =& $manager->getItem($itemid, 1, 1);
                $blog =& $manager->getBlog($item['blogid']);
-               $data = array('blog'=> $blog, 'item' => $item);
+               $data = array('blog'=> &$blog, 'item' => &$item);
                $manager->notify('PrepareItemForEdit', $data);
                
                if ( $blog->convertBreaks() )
@@ -2968,7 +2968,7 @@ class Admin
                
                $member->isAdmin() or self::disallow();
                
-               self::$extrahead .= "<script type=\"text/javascript\" src=\"<%skinfile(javascript/templateEdit.js)%>\"></script>\n";
+               self::$extrahead .= "<script type=\"text/javascript\" src=\"<%skinfile(/javascripts/templateEdit.js)%>\"></script>\n";
                self::$extrahead .= "<script type=\"text/javascript\">setTemplateEditText('" . Entity::hsc(_EDITTEMPLATE_EMPTY) . "');</script>\n";
                
                self::$skin->parse('templateedit');
@@ -3043,7 +3043,6 @@ class Admin
                self::addToTemplate($templateid, 'DATE_FOOTER',                 postVar('DATE_FOOTER'));
                self::addToTemplate($templateid, 'FORMAT_DATE',                 postVar('FORMAT_DATE'));
                self::addToTemplate($templateid, 'FORMAT_TIME',                 postVar('FORMAT_TIME'));
-               self::addToTemplate($templateid, 'LOCALE',                              postVar('LOCALE'));
                self::addToTemplate($templateid, 'SEARCH_HIGHLIGHT',    postVar('SEARCH_HIGHLIGHT'));
                self::addToTemplate($templateid, 'SEARCH_NOTHINGFOUND', postVar('SEARCH_NOTHINGFOUND'));
                self::addToTemplate($templateid, 'POPUP_CODE',                  postVar('POPUP_CODE'));
@@ -3253,7 +3252,7 @@ class Admin
                }
                $member->isAdmin() or self::disallow();
                
-               self::$extrahead .= "<script type=\"text/javascript\" src=\"<%skinfile(javascript/templateEdit.js)%>\"></script>\n";
+               self::$extrahead .= "<script type=\"text/javascript\" src=\"<%skinfile(/javascripts/templateEdit.js)%>\"></script>\n";
                self::$extrahead .= '<script type="text/javascript">setTemplateEditText("' . Entity::hsc(_EDITTEMPLATE_EMPTY) . '");</script>' . "\n";
                
                self::$skin->parse('admintemplateedit');
@@ -3398,6 +3397,7 @@ class Admin
                self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_IBANLIST_HEAD',       postVar('SHOWLIST_LISTPLUG_TABLE_IBANLIST_HEAD'));
                self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_IBANLIST_BODY',       postVar('SHOWLIST_LISTPLUG_TABLE_IBANLIST_BODY'));
                self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_IBANLIST_FOOT',       postVar('SHOWLIST_LISTPLUG_TABLE_IBANLIST_FOOT'));
+               self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_NAVILIST',            postVar('SHOWLIST_LISTPLUG_TABLE_NAVILIST'));
                self::addToTemplate($templateid, 'PLUGIN_QUICKMENU_TITLE',                                      postVar('PLUGIN_QUICKMENU_TITLE'));
                self::addToTemplate($templateid, 'PLUGIN_QUICKMENU_HEAD',                                       postVar('PLUGIN_QUICKMENU_HEAD'));
                self::addToTemplate($templateid, 'PLUGIN_QUICKMENU_BODY',                                       postVar('PLUGIN_QUICKMENU_BODY'));
@@ -4186,7 +4186,7 @@ class Admin
         */
        static private function action_adminskiniedoimport()
        {
-               global $DIR_SKINS, $member;
+               global $DIR_SKINS, $member, $CONF;
                
                $member->isAdmin() or self::disallow();
                
@@ -4210,6 +4210,11 @@ class Admin
                        $query  = "UPDATE %s SET value = %d WHERE name = 'AdminSkin'";
                        $query  = sprintf($query, sql_table('config'), $res);
                        DB::execute($query);
+                       if ( $res )
+                       {
+                               redirect($CONF['AdminURL']);
+                               exit;
+                       }
                        $skin   = new Skin(0, 'AdminActions', 'AdminSkin');
                        $skin->parse('importAdmin', $DIR_SKINS . 'admin/defaultimporter.skn');
                }