Index: kernel/application.php
===================================================================
--- kernel/application.php	(revision 13571)
+++ kernel/application.php	(working copy)
@@ -1509,14 +1509,6 @@
 		// $params = array_merge_recursive2($this->getPassThroughVariables($params), $params);
 		$params = array_merge($this->getPassThroughVariables($params), $params);
 
-		if ($this->GetVar('admin') || (array_key_exists('admin', $params) && $params['admin'])) {
-			$params['admin'] = 1;
-
-			if (!array_key_exists('editing_mode', $params)) {
-				$params['editing_mode'] = EDITING_MODE;
-			}
-		}
-
 		if ($force_rewrite || ($this->RewriteURLs($ssl) && !$no_rewrite)) {
 			static $rewrite_listeners_done = false;
 
@@ -1628,6 +1620,14 @@
 
 	function BuildEnv_NEW($t, $params, $pass='all', $pass_events = false)
 	{
+		if ($this->GetVar('admin') || (array_key_exists('admin', $params) && $params['admin'])) {
+			$params['admin'] = 1;
+
+			if (!array_key_exists('editing_mode', $params)) {
+				$params['editing_mode'] = EDITING_MODE;
+			}
+		}
+
 		$ret = '';
 		$env = '';
 
@@ -1817,6 +1817,14 @@
 
 	function BuildEnv($t, $params, $pass='all', $pass_events = false, $env_var = true)
 	{
+		if ($this->GetVar('admin') || (array_key_exists('admin', $params) && $params['admin'])) {
+			$params['admin'] = 1;
+
+			if (!array_key_exists('editing_mode', $params)) {
+				$params['editing_mode'] = EDITING_MODE;
+			}
+		}
+
 		$session =& $this->recallObject('Session');
 		$ssl = isset($params['__SSL__']) ? $params['__SSL__'] : 0;
 		$sid = $session->NeedQueryString() && !$this->RewriteURLs($ssl) ? $this->GetSID() : '';