Index: branches/RC/core/kernel/session/session.php =================================================================== diff -u -N -r11682 -r11711 --- branches/RC/core/kernel/session/session.php (.../session.php) (revision 11682) +++ branches/RC/core/kernel/session/session.php (.../session.php) (revision 11711) @@ -131,7 +131,9 @@ $query = ' SELECT * FROM '.$this->TableName.' WHERE '.$this->IDField.' = '.$this->Conn->qstr($sid); $result = $this->Conn->GetRow($query); - if($result===false) return false; + if ($result === false) { + return false; + } $this->DirectVars = $result; @@ -332,7 +334,7 @@ function RecallPersistentVar(&$session, $var_name, $default = false) { if ($session->RecallVar('user_id') == -2) { - if ($default == '_USE_DEFAULT_USER_DATA_') { + if ($default == ALLOW_DEFAULT_SETTINGS) { $default = null; } return $session->RecallVar($var_name, $default); @@ -341,7 +343,7 @@ if (array_key_exists($var_name, $this->PersistentVars)) { return $this->PersistentVars[$var_name]; } - elseif ($default == '_USE_DEFAULT_USER_DATA_') { + elseif ($default == ALLOW_DEFAULT_SETTINGS) { $default_user_id = $this->Application->ConfigValue('DefaultSettingsUserId'); if (!$default_user_id) { $default_user_id = -1;