Index: branches/RC/core/kernel/session/session.php =================================================================== diff -u -N -r10024 -r10037 --- branches/RC/core/kernel/session/session.php (.../session.php) (revision 10024) +++ branches/RC/core/kernel/session/session.php (.../session.php) (revision 10037) @@ -319,6 +319,9 @@ function RecallPersistentVar(&$session, $var_name, $default = false) { if ($session->RecallVar('user_id') == -2) { + if ($default == '_USE_DEFAULT_USER_DATA_') { + $default = null; + } return $session->RecallVar($var_name, $default); } @@ -334,8 +337,8 @@ FROM '.TABLE_PREFIX.'PersistantSessionData WHERE VariableName = '.$this->Conn->qstr($var_name).' AND PortalUserId = '.$default_user_id; $value = $this->Conn->GetOne($sql); + $this->PersistentVars[$var_name] = $value; if ($value !== false) { - $this->PersistentVars[$var_name] = $value; $this->StorePersistentVar($session, $var_name, $value); //storing it, so next time we don't load default user setting } return $value;