Index: branches/unlabeled/unlabeled-1.36.2/core/units/admin/admin_tag_processor.php
===================================================================
diff -u -N -r8647 -r8698
--- branches/unlabeled/unlabeled-1.36.2/core/units/admin/admin_tag_processor.php	(.../admin_tag_processor.php)	(revision 8647)
+++ branches/unlabeled/unlabeled-1.36.2/core/units/admin/admin_tag_processor.php	(.../admin_tag_processor.php)	(revision 8698)
@@ -728,7 +728,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);
@@ -737,20 +737,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;
@@ -759,8 +759,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);
 		}