Index: trunk/core/kernel/parser/template.php =================================================================== diff -u -N -r6583 -r6669 --- trunk/core/kernel/parser/template.php (.../template.php) (revision 6583) +++ trunk/core/kernel/parser/template.php (.../template.php) (revision 6669) @@ -98,7 +98,7 @@ if (isset($this->Application->ReplacementTemplates[$filename])) { $filename = $this->Application->ReplacementTemplates[$filename]; } - + if (preg_match('#^[\/]{0,1}([^\/]*)\/(.*)#', $filename, $regs)) { $module_filename = $regs[2]; $first_dir = $regs[1]; @@ -109,6 +109,9 @@ } if ( $this->Application->IsAdmin() && $this->Application->findModule('Name', $first_dir)) { + if ($first_dir == 'in-portal') { + $first_dir = 'kernel'; + } $path = MODULES_PATH.'/'.strtolower($first_dir).'/admin_templates'; } else { @@ -118,7 +121,7 @@ return Array ($path, $module_filename); } - + function LoadTemplate($filename, $title=NULL, $silent=0) { list ($path, $module_filename) = $this->GetTemplatePaths($filename); @@ -228,7 +231,7 @@ $dir = preg_replace('/^'.preg_quote($base_path.'/', '/').'/', '', $dir, 1); $segments = explode('/', $dir); $cur_path = $base_path; - + foreach ($segments as $segment) { // do not add leading / for windows paths (c:\...) $cur_path .= preg_match('/^[a-zA-Z]{1}:/', $segment) ? $segment : '/'.$segment;