Minahito
minah****@users*****
2006年 8月 3日 (木) 02:47:25 JST
Index: xoops2jp/html/modules/base/kernel/Legacy_AdminRenderSystem.class.php
diff -u xoops2jp/html/modules/base/kernel/Legacy_AdminRenderSystem.class.php:1.1.2.6 xoops2jp/html/modules/base/kernel/Legacy_AdminRenderSystem.class.php:1.1.2.7
--- xoops2jp/html/modules/base/kernel/Legacy_AdminRenderSystem.class.php:1.1.2.6 Fri Apr 28 18:28:33 2006
+++ xoops2jp/html/modules/base/kernel/Legacy_AdminRenderSystem.class.php Thu Aug 3 02:47:25 2006
@@ -37,9 +37,6 @@
$this->left_delimiter = "<{";
$this->right_delimiter = "}>";
- $this->register_modifier("theme", "Legacy_modifier_theme");
- $this->register_function("stylesheet", "Legacy_function_stylesheet");
-
//
// [TODO]
// If we don't set true to the following flag, a user can not recover
@@ -102,6 +99,8 @@
$this->mController =& $controller;
$this->mSmarty =& new Legacy_AdminSmarty();
+ $this->mSmarty->register_modifier("theme", "Legacy_modifier_theme");
+ $this->mSmarty->register_function("stylesheet", "Legacy_function_stylesheet");
$this->mSmarty->assign(array(
"xoops_url" => XOOPS_URL,
@@ -249,12 +248,19 @@
}
}
-function Legacy_get_ovveride_file($file, $prefix = null)
+function Legacy_get_ovveride_file($file, $prefix = null, $isSpDirname = false)
{
$root =& XCube_Root::getSingleton();
$modController =& $root->mController->getModuleController();
$moduleObject =& $modController->getXoopsModule();
+ if ($isSpDirname && is_object($moduleObject) && $moduleObject->get('dirname') == 'base' && isset($_REQUEST['dirname'])) {
+ if (preg_match("/^[a-z0-9_]+$/i", xoops_getrequest('dirname'))) {
+ $handler =& xoops_gethandler('module');
+ $moduleObject =& $handler->getByDirname(xoops_getrequest('dirname'));
+ }
+ }
+
$theme = $root->mSiteConfig['Legacy']['Theme'];
$ret = array();