FIXED: When inclusion tried to do the special skin type by skin of error types, ...

git-svn-id: https://svn.sourceforge.jp/svnroot/nucleus-jp/nucleus-jp/trunk/utf8@992 1ca29b6e-896d-4ea0-84a5-967f57386b96

diff --git a/nucleus/libs/BaseActions.php b/nucleus/libs/BaseActions.php
index efa8bb7..9609c9d 100644 (file)
--- a/nucleus/libs/BaseActions.php
+++ b/nucleus/libs/BaseActions.php
@@ -77,15 +77,6 @@ class BaseActions {
                // check current level
                if ($this->level > 3) return;   // max. depth reached (avoid endless loop)
                global $skinid;
                // check current level
                if ($this->level > 3) return;   // max. depth reached (avoid endless loop)
                global $skinid;

-               if (!$skinid) {
-                       global $manager, $blogid;
-                       if (!$blogid) {
-                               global $CONF;
-                               $blogid = $CONF['DefaultBlog'];
-                       }
-                       $blog   = &$manager->getBlog($blogid);
-                       $skinid =  $blog->getDefaultSkin();
-               }

                $skin = new SKIN($skinid);
                $file = $this->getIncludeFileName($filename);
                if (!$skin->isValid && !file_exists($file)) {
                $skin = new SKIN($skinid);
                $file = $this->getIncludeFileName($filename);
                if (!$skin->isValid && !file_exists($file)) {

diff --git a/nucleus/libs/globalfunctions.php b/nucleus/libs/globalfunctions.php
index b5b45b5..d35eb58 100755 (executable)
--- a/nucleus/libs/globalfunctions.php
+++ b/nucleus/libs/globalfunctions.php
@@ -1073,6 +1073,7 @@ function doError($msg, $skin = '') {
 \r
        }\r
 \r
 \r
        }\r
 \r

+       $skinid = $skin->id;\r

        $errormessage = $msg;\r
        $skin->parse('error');\r
        exit;\r
        $errormessage = $msg;\r
        $skin->parse('error');\r
        exit;\r