From 99cdffb2f3001345050d9b883367c016df9805ce Mon Sep 17 00:00:00 2001 From: shizuki Date: Sun, 22 Mar 2009 16:39:10 +0000 Subject: [PATCH] FIXED: When inclusion tried to do the special skin type by skin of error types, $skinid wasn't set. git-svn-id: https://svn.sourceforge.jp/svnroot/nucleus-jp/nucleus-jp/trunk/utf8@992 1ca29b6e-896d-4ea0-84a5-967f57386b96 --- nucleus/libs/BaseActions.php | 9 --------- nucleus/libs/globalfunctions.php | 1 + 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/nucleus/libs/BaseActions.php b/nucleus/libs/BaseActions.php index efa8bb7..9609c9d 100644 --- 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; - 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)) { diff --git a/nucleus/libs/globalfunctions.php b/nucleus/libs/globalfunctions.php index b5b45b5..d35eb58 100755 --- a/nucleus/libs/globalfunctions.php +++ b/nucleus/libs/globalfunctions.php @@ -1073,6 +1073,7 @@ function doError($msg, $skin = '') { } + $skinid = $skin->id; $errormessage = $msg; $skin->parse('error'); exit; -- 2.11.0