Index: branches/RC/core/kernel/processors/main_processor.php =================================================================== diff -u -N -r11525 -r11648 --- branches/RC/core/kernel/processors/main_processor.php (.../main_processor.php) (revision 11525) +++ branches/RC/core/kernel/processors/main_processor.php (.../main_processor.php) (revision 11648) @@ -33,26 +33,31 @@ */ function TemplatesBase($params) { - if ($this->Application->IsAdmin()) { - $module = isset($params['module']) ? $params['module'] : 'core'; + $force_admin = array_key_exists('force_admin', $params) && $params['force_admin']; + $module = array_key_exists('module', $params) ? $params['module'] : 'core'; + + if ($this->Application->IsAdmin() || $force_admin) { if ($module == 'in-portal') { $module = 'kernel'; } - $path = preg_replace('/\/(.*?)\/(.*)/', $module.'/\\2', THEMES_PATH); // remove leading slash + substitute module + + $path = $force_admin ? '/core/admin_templates' : THEMES_PATH; + $path = preg_replace('/\/(.*?)\/(.*)/', $module.'/\\2', $path); // remove leading slash + substitute module } else { $path = mb_substr(THEMES_PATH, 1); - $module = isset($params['module']) ? $params['module'] : 'core'; if (mb_strtolower($module) == 'in-portal') { $module_folder = 'platform'; } else { $module_folder = $this->Application->findModule('Name', $module, 'TemplatePath'); } - $path .= rtrim('/'.trim($module_folder, '/'), '/').'/'; + + $path .= rtrim('/' . trim($module_folder, '/'), '/') . '/'; } - return $this->Application->BaseURL().$path; + + return $this->Application->BaseURL() . $path; } /**