Index: branches/5.2.x/core/units/users/users_event_handler.php =================================================================== diff -u -N -r14765 -r14804 --- branches/5.2.x/core/units/users/users_event_handler.php (.../users_event_handler.php) (revision 14765) +++ branches/5.2.x/core/units/users/users_event_handler.php (.../users_event_handler.php) (revision 14804) @@ -1,6 +1,6 @@ status = kEvent::erFAIL; $object->SetError('UserLogin', $result == LoginResult::NO_PERMISSION ? 'no_permission' : 'invalid_password'); } + + if ( $event->MasterEvent->Name == 'OnLoginAjax' ) { + // used to insert just logged-in user e-mail on "One Step Checkout" form in "Modern Store" theme + $user =& $user_helper->getUserObject(); + $event->SetRedirectParam('user_email', $user->GetDBField('Email')); + } } /** @@ -286,7 +292,7 @@ $ajax_form_helper =& $this->Application->recallObject('AjaxFormHelper'); /* @var $ajax_form_helper AjaxFormHelper */ - $ajax_form_helper->transitEvent($event, 'OnLogin', Array ('do_refresh' => 1)); + $ajax_form_helper->transitEvent($event, 'OnLogin'); //, Array ('do_refresh' => 1)); } /** Index: branches/5.2.x/core/units/helpers/ajax_form_helper.php =================================================================== diff -u -N -r14762 -r14804 --- branches/5.2.x/core/units/helpers/ajax_form_helper.php (.../ajax_form_helper.php) (revision 14762) +++ branches/5.2.x/core/units/helpers/ajax_form_helper.php (.../ajax_form_helper.php) (revision 14804) @@ -76,6 +76,9 @@ if ( $event->status != kEvent::erSUCCESS ) { $this->prepareJSONErrors($event, $params); } + else { + $params = array_merge($params, $event->getRedirectParams()); + } $this->sendResponse($event, $params); }