Index: branches/5.0.x/core/units/email_events/email_events_event_handler.php =================================================================== diff -u -r12117 -r12196 --- branches/5.0.x/core/units/email_events/email_events_event_handler.php (.../email_events_event_handler.php) (revision 12117) +++ branches/5.0.x/core/units/email_events/email_events_event_handler.php (.../email_events_event_handler.php) (revision 12196) @@ -1,6 +1,6 @@ Application->isDebugMode()) { - $this->Application->Debugger->appendTrace(); + if ($send_params && array_key_exists('language_id', $send_params)) { + return $send_params['language_id']; } - return array_key_exists('language_id', $send_params) ? $send_params['language_id'] : $this->Application->GetVar('m_lang'); + + return $this->Application->GetVar('m_lang'); } function _changeLanguage($language_id = null)