Index: branches/unlabeled/unlabeled-1.49.2/core/kernel/db/db_tag_processor.php =================================================================== diff -u -r4324 -r4411 --- branches/unlabeled/unlabeled-1.49.2/core/kernel/db/db_tag_processor.php (.../db_tag_processor.php) (revision 4324) +++ branches/unlabeled/unlabeled-1.49.2/core/kernel/db/db_tag_processor.php (.../db_tag_processor.php) (revision 4411) @@ -1124,7 +1124,7 @@ $preset_name = replaceModuleSection($params['title_preset']); $title_presets = $this->Application->getUnitOption($this->Prefix,'TitlePresets'); $title_info = getArrayValue($title_presets, $preset_name); - if($title_info === false) return $params['title']; + if($title_info === false) return str_replace('#preset_name#', $preset_name, $params['title']); if( getArrayValue($title_presets,'default') ) { @@ -1449,13 +1449,17 @@ function ModulePath($params) { $force_module = getArrayValue($params, 'module'); - if($force_module) - { - $force_module = strtolower($force_module); + if ($force_module) { + if ($force_module == '#session#') { + $force_module = $this->Application->RecallVar('module'); + } + else { + $force_module = strtolower($force_module); + } + $module_folder = trim( $this->Conn->GetOne('SELECT Path FROM '.TABLE_PREFIX.'Modules WHERE LOWER(Name) = '.$this->Conn->qstr($force_module) ), '/'); } - else - { + else { $module_folder = $this->Application->getUnitOption($this->Prefix, 'ModuleFolder'); } return '../../'.$module_folder.'/admin_templates/';