Index: trunk/core/units/admin/admin_tag_processor.php =================================================================== diff -u -N -r8413 -r8697 --- trunk/core/units/admin/admin_tag_processor.php (.../admin_tag_processor.php) (revision 8413) +++ trunk/core/units/admin/admin_tag_processor.php (.../admin_tag_processor.php) (revision 8697) @@ -738,7 +738,7 @@ // check last_template in session $last_template = $this->Application->RecallVar('last_template_popup'); // because of m_opener=s there } - + if (!$last_template) { $params['persistent'] = 1; return $persistent ? false : $this->MainFrameLink($params); @@ -747,20 +747,20 @@ list($index_file, $env) = explode('|', $last_template); $vars = $this->Application->HttpQuery->processQueryString($env, 'pass'); $recursion_templates = Array ('login', 'index', 'no_permission'); - + if (isset($vars['admin']) && $vars['admin'] == 1) { // index template doesn't begin recursion on front-end (in admin frame) $vars['m_theme'] = ''; - + if (isset($params['m_opener']) && $params['m_opener'] == 'r') { // front-end link for highlighting purposes $vars['t'] = 'index'; $vars['m_cat_id'] = $this->Application->findModule('Name', 'Proj-CMS', 'RootCat'); } - + unset($recursion_templates[ array_search('index', $recursion_templates)]); } - + if (in_array($vars['t'], $recursion_templates)) { // prevents redirect recursion OR old in-portal pages $params['persistent'] = 1; @@ -769,8 +769,8 @@ $vars = array_merge_recursive2($vars, $params); $t = $vars['t']; - unset($vars['t']); - + unset($vars['t'], $vars['persistent']); + return $this->Application->HREF($t, '', $vars, $index_file); } @@ -821,10 +821,10 @@ // not found (try to compile on the fly) $object =& $this->Application->recallObject('skin.-item', null, Array ('skip_autoload' => true)); /* @var $object kDBItem */ - + $skin_eh =& $this->Application->recallObject('skin_EventHandler'); /* @var $skin_eh SkinEventHandler */ - + $object->Load(1, 'IsPrimary'); $skin_eh->Compile($object); $ret = $css_url.'admin-'.$style_name.'-'.adodb_mktime().'.css';