Index: branches/unlabeled/unlabeled-1.52.4/core/kernel/session/session.php
===================================================================
diff -u -r7092 -r7474
--- branches/unlabeled/unlabeled-1.52.4/core/kernel/session/session.php	(.../session.php)	(revision 7092)
+++ branches/unlabeled/unlabeled-1.52.4/core/kernel/session/session.php	(.../session.php)	(revision 7474)
@@ -507,7 +507,7 @@
 	{
 		setcookie($name, $value, $expires, $this->CookiePath, $this->CookieDomain, $this->CookieSecure);
 	}
-	
+
 	function Check()
 	{
 		// we should check referer if cookies are disabled, and in combined mode
@@ -731,7 +731,8 @@
 				}
 			}
 			$this->Application->Debugger->dumpVars($session_data);
-
+		}
+		if ($this->Application->isDebugMode() && constOn('DBG_SHOW_PERSISTENTDATA')) {
 			// dump persistent session data
 			if ($this->Storage->PersistentVars) {
 				$this->Application->Debugger->appendHTML('Persistant Session:');
@@ -744,10 +745,6 @@
 				}
 				$this->Application->Debugger->dumpVars($session_data);
 			}
-
-//			 to insert after HTTPQuery if it's visible
-//			$new_row = constOn('DBG_SHOW_HTTPQUERY') ? 4 : 2;
-//			$debugger->moveAfterRow($new_row,2);
 		}
 	}
 
@@ -765,15 +762,15 @@
 	{
 		// save last_template
 		$wid = $this->Application->GetVar('m_wid');
-		
+
 		$last_env = $this->getLastTemplateENV($t, Array('m_opener' => 'u'));
 		$last_template = basename($_SERVER['PHP_SELF']).'|'.substr($last_env, strlen(ENV_VAR_NAME) + 1);
 		$this->StoreVar(rtrim('last_template_'.$wid, '_'), $last_template);
-		
+
 		$last_env = $this->getLastTemplateENV($t, Array());
 		$last_template = basename($_SERVER['PHP_SELF']).'|'.substr($last_env, strlen(ENV_VAR_NAME) + 1);
 		$this->StoreVar(rtrim('last_template_popup_'.$wid, '_'), $last_template);
-		
+
 		// save other last... variables for mistical purposes (customizations may be)
 		$this->StoreVar('last_url', $_SERVER['REQUEST_URI']); // needed by ord:StoreContinueShoppingLink
 		$this->StoreVar('last_env', substr($last_env, strlen(ENV_VAR_NAME)+1));
@@ -784,7 +781,7 @@
 		$params['__URLENCODE__'] = 1;
 		return $this->Application->BuildEnv($t, $params, 'all');
 	}
-	
+
 	function StoreVar($name, $value)
 	{
 		$this->Data->Set($name, $value);