Index: branches/unlabeled/unlabeled-1.18.4/core/kernel/parser/template.php =================================================================== diff -u -r6826 -r7072 --- branches/unlabeled/unlabeled-1.18.4/core/kernel/parser/template.php (.../template.php) (revision 6826) +++ branches/unlabeled/unlabeled-1.18.4/core/kernel/parser/template.php (.../template.php) (revision 7072) @@ -108,7 +108,18 @@ $module_filename = $filename; } - if ( $this->Application->IsAdmin() && $this->Application->findModule('Name', $first_dir)) { + // !preg_match for backward compatability with full-path plugins + if ($this->Application->IsAdmin() && $first_dir == 'plugins' && !preg_match('/admin_templates/', $module_filename)) { + if (preg_match('#^[\/]{0,1}([^\/]*)\/(.*)#', $module_filename, $regs)) {; + $path = MODULES_PATH.'/'.strtolower($first_dir).'/'.$regs[1].'/admin_templates'; + $module_filename = $regs[2]; + } + else { + $first_dir = ''; + $module_filename = $filename; + } + } + elseif ( $this->Application->IsAdmin() && $this->Application->findModule('Name', $first_dir)) { if ($first_dir == 'in-portal') { $first_dir = 'kernel'; }