Index: trunk/kernel/include/usersession.php =================================================================== diff -u -N -r7413 -r7884 --- trunk/kernel/include/usersession.php (.../usersession.php) (revision 7413) +++ trunk/kernel/include/usersession.php (.../usersession.php) (revision 7884) @@ -638,22 +638,22 @@ { global $objConfig, $objUsers; + $val = ''; $UserID = $this->Get("PortalUserId"); - if(is_numeric($UserID)) - { - if(!is_object($this->CurrentUser)) - { + if (is_numeric($UserID)) { + if (!is_object($this->CurrentUser)) { $this->CurrentUser = $objUsers->GetItem($UserID); } - if(!$this->CurrentUser->VarsLoaded) - { + if (!$this->CurrentUser->VarsLoaded) { $this->CurrentUser->LoadPersistantVars(); } $val = $this->CurrentUser->GetPersistantVariable($variableName); //echo "Persistant Val for $variableName: $val
"; } - if(!strlen($val)) + if (!strlen($val)) { $val = $objConfig->Get($variableName); + } + return $val; }