Index: branches/5.2.x/core/units/users/users_tag_processor.php =================================================================== diff -u -r16513 -r16804 --- branches/5.2.x/core/units/users/users_tag_processor.php (.../users_tag_processor.php) (revision 16513) +++ branches/5.2.x/core/units/users/users_tag_processor.php (.../users_tag_processor.php) (revision 16804) @@ -1,6 +1,6 @@ Application->GetVar('save_username'); // from cookie + $username = $this->Application->GetVarDirect('save_username', 'Cookie'); if ($username == 'super-root') { $username = 'root'; Index: branches/5.2.x/core/units/users/users_event_handler.php =================================================================== diff -u -r16797 -r16804 --- branches/5.2.x/core/units/users/users_event_handler.php (.../users_event_handler.php) (revision 16797) +++ branches/5.2.x/core/units/users/users_event_handler.php (.../users_event_handler.php) (revision 16804) @@ -1,6 +1,6 @@ Application->GetVar('remember_login'); + $remember_login_cookie = $this->Application->GetVarDirect('remember_login', 'Cookie'); if (!$remember_login_cookie || $this->Application->isAdmin || $this->Application->LoggedIn()) { return ; Index: branches/5.2.x/core/units/helpers/user_helper.php =================================================================== diff -u -r16793 -r16804 --- branches/5.2.x/core/units/helpers/user_helper.php (.../user_helper.php) (revision 16793) +++ branches/5.2.x/core/units/helpers/user_helper.php (.../user_helper.php) (revision 16804) @@ -1,6 +1,6 @@ Application->isAdmin ) { $save_username = $this->Application->GetVar('cb_save_username') ? $username : ''; $this->Application->Session->SetCookie('save_username', $save_username, strtotime('+1 year')); - - // cookie will be set on next refresh, but refresh won't occur if - // login error present, so duplicate cookie in kHTTPQuery - $this->Application->SetVar('save_username', $save_username); } // logging in "root" (admin only) Index: branches/5.2.x/core/units/forms/form_submissions/form_submissions_eh.php =================================================================== diff -u -r16513 -r16804 --- branches/5.2.x/core/units/forms/form_submissions/form_submissions_eh.php (.../form_submissions_eh.php) (revision 16513) +++ branches/5.2.x/core/units/forms/form_submissions/form_submissions_eh.php (.../form_submissions_eh.php) (revision 16804) @@ -1,6 +1,6 @@ SetDBField('IPAddress', $this->Application->getClientIp()); if ( !$object->GetDBField('ReferrerURL') ) { - $referrer = $this->Application->GetVar('original_referrer'); + $referrer = $this->Application->GetVarDirect('original_referrer', 'Cookie'); if ( !$referrer ) { $base_url = preg_quote($this->Application->BaseURL(), '/'); Index: branches/5.2.x/core/kernel/utility/http_query.php =================================================================== diff -u -r16802 -r16804 --- branches/5.2.x/core/kernel/utility/http_query.php (.../http_query.php) (revision 16802) +++ branches/5.2.x/core/kernel/utility/http_query.php (.../http_query.php) (revision 16804) @@ -1,6 +1,6 @@ Order, 'C') === false ) { + $this->Cookie = $this->StripSlashes($_COOKIE); + } } /** Index: branches/5.2.x/core/units/phrases/phrases_event_handler.php =================================================================== diff -u -r16513 -r16804 --- branches/5.2.x/core/units/phrases/phrases_event_handler.php (.../phrases_event_handler.php) (revision 16513) +++ branches/5.2.x/core/units/phrases/phrases_event_handler.php (.../phrases_event_handler.php) (revision 16804) @@ -1,6 +1,6 @@ Application->GetVar('last_module'); + $last_module = $this->Application->GetVarDirect('last_module', 'Cookie'); if ( $last_module ) { $object->SetDBField('Module', $last_module); Index: branches/5.2.x/core/units/admin/admin_events_handler.php =================================================================== diff -u -r16797 -r16804 --- branches/5.2.x/core/units/admin/admin_events_handler.php (.../admin_events_handler.php) (revision 16797) +++ branches/5.2.x/core/units/admin/admin_events_handler.php (.../admin_events_handler.php) (revision 16804) @@ -1,6 +1,6 @@ Application->Session->SetCookie('original_referrer', $referrer); - $this->Application->SetVar('original_referrer', $referrer); } }