Index: trunk/kernel/include/usersession.php
===================================================================
diff -u -r1376 -r1462
--- trunk/kernel/include/usersession.php	(.../usersession.php)	(revision 1376)
+++ trunk/kernel/include/usersession.php	(.../usersession.php)	(revision 1462)
@@ -532,30 +532,30 @@
         $this->PermCache = array();
 	}
 	
-    function SetVariable( $variableName, $variableValue)
-    {
-	  global $objConfig, $FrontEnd;
+	function SetVariable($variableName, $variableValue)
+	{
+		global $objConfig, $FrontEnd;
 
-      $objConfig->Set($variableName,$variableValue,2);
-		 $variableValue=addslashes($variableValue);
-      
-      //if(!(int)$FrontEnd==1)
-      //{      
-          $sessionkey = $this->GetSessionKey();
-          $sql = "SELECT * FROM ".GetTablePrefix()."SessionData WHERE VariableName='$variableName' AND SessionKey='$sessionkey'";
-          $rs = $this->adodbConnection->Execute($sql);
-          if($rs && !$rs->EOF)
-          {
-              $sql = "UPDATE ".GetTablePrefix()."SessionData SET VariableValue='$variableValue' WHERE VariableName='$variableName' AND SessionKey='$sessionkey'";
-          }
-          else
-              $sql = "INSERT INTO ".GetTablePrefix()."SessionData (VariableName,VariableValue,SessionKey) VALUES ('$variableName','$variableValue','$sessionkey')";
-            
-          $this->adodbConnection->Execute($sql); 
-//			echo "<BR>UPDATE: $sql<BR>";	
-      //}
-    }
+		$objConfig->Set($variableName,$variableValue,2);
+		$variableValue = addslashes($variableValue);
 
+		//if(!(int)$FrontEnd==1)
+		//{
+		$sessionkey = $this->GetSessionKey();
+		$sql = "SELECT * FROM ".GetTablePrefix()."SessionData WHERE VariableName='$variableName' AND SessionKey='$sessionkey'";
+		$rs = $this->adodbConnection->Execute($sql);
+		if($rs && !$rs->EOF)
+		{
+			$sql = "UPDATE ".GetTablePrefix()."SessionData SET VariableValue='$variableValue' WHERE VariableName='$variableName' AND SessionKey='$sessionkey'";
+		}
+		else
+		$sql = "INSERT INTO ".GetTablePrefix()."SessionData (VariableName,VariableValue,SessionKey) VALUES ('$variableName','$variableValue','$sessionkey')";
+
+		$this->adodbConnection->Execute($sql);
+		//			echo "<BR>UPDATE: $sql<BR>";
+		//}
+	}
+
 	function SetPersistantVariable($variableName, $variableValue)
 	{
 	  global $objConfig, $objUsers;
@@ -577,7 +577,9 @@
             //$this->SetVariable($variableName,$variableValue);      
       }
       else
+      {
           $this->SetVariable($variableName,$variableValue);
+      }
 	}
 
 	function GetPersistantVariable($variableName)
@@ -619,12 +621,16 @@
        $sql = "SELECT VariableName, VariableValue FROM ".GetTablePrefix()."SessionData where SessionKey='" . $this->Get("SessionKey") . "'";
        //echo $sql."<br>\n";
        $result = $this->adodbConnection->Execute($sql);
-       while ($result && !$result->EOF)
+       
+       if( basename($_SERVER['PHP_SELF']) != 'edit_config.php' )
        {
-         $data = $result->fields;
-         //echo "<PRE>"; print_r($data); echo "</PRE>";
-         $objConfig->Set($data["VariableName"],$data["VariableValue"],FALSE);
-         $result->MoveNext();
+       		while ($result && !$result->EOF)
+	       {
+	         $data = $result->fields;
+	         //echo "<PRE>"; print_r($data); echo "</PRE>";
+	         $objConfig->Set($data["VariableName"],$data["VariableValue"],FALSE);
+	         $result->MoveNext();
+	       }
        }
        
        if(!is_object($this->CurrentUser))