FIX:<%pagehead%>、<%pagefoot%>の内容がデータベースに格納されているとプラグインイベントが発生しなかった不具合を修正

diff --git a/nucleus/libs/AdminActions.php b/nucleus/libs/AdminActions.php
index 9e268fa..47212a7 100644 (file)
--- a/nucleus/libs/AdminActions.php
+++ b/nucleus/libs/AdminActions.php
@@ -5763,16 +5763,16 @@ class AdminActions extends BaseActions
        {
                global $member, $nucleus, $CONF, $manager;
                
+               $extrahead = Admin::getAdminextrahead();
+               $data = array(
+                       'extrahead'     => &$extrahead,
+                       'action'        =>  Admin::getAdminAction()
+               );
+               $manager->notify('AdminPrePageHead', $data);
+
                $content = $this->parser->skin->getContentFromDB('pagehead');
                if ( !$content )
                {
-                       $extrahead = Admin::getAdminextrahead();
-                       $data = array(
-                               'extrahead'     => &$extrahead,
-                               'action'        =>  Admin::getAdminAction()
-                       );
-                       $manager->notify('AdminPrePageHead', $data);
-                       
                        $baseUrl = Entity::hsc($CONF['SkinsURL']);
                        
                        /*
@@ -5885,14 +5885,14 @@ class AdminActions extends BaseActions
        {
                global $action, $member, $manager;
                
+               $data = array(
+                       'action' => Admin::getAdminAction()
+               );
+               $manager->notify('AdminPrePageFoot', $data);
+
                $content = $this->parser->skin->getContentFromDB('pagefoot');
                if ( !$content )
                {
-                       $data = array(
-                               'action' => Admin::getAdminAction()
-                       );
-                       $manager->notify('AdminPrePageFoot', $data);
-                       
                        if ( $member->isLoggedIn() && ($action != 'showlogin') )
                        {
                                echo '<h2>' . _LOGOUT . "</h2>\n";