Index: email_events_event_handler.php =================================================================== --- email_events_event_handler.php (revision 15158) +++ email_events_event_handler.php (working copy) @@ -739,23 +739,26 @@ function _changeLanguage($language_id = null) { - static $prev_language_id = null; + static $prev_language_id = NULL; - if (!isset($language_id)) { + if ( !isset($prev_language_id) ) { + $prev_language_id = $this->Application->GetVar('m_lang'); + } + + if ( !isset($language_id) ) { // restore language $language_id = $prev_language_id; } $this->Application->SetVar('m_lang', $language_id); + $language =& $this->Application->recallObject('lang.current'); - /* @var $lang_object kDBItem */ + /* @var $language kDBItem */ $language->Load($language_id); $this->Application->Phrases->LanguageId = $language_id; - $this->Application->Phrases->Phrases = Array(); - - $prev_language_id = $language_id; // for restoring it later + $this->Application->Phrases->Phrases = Array (); } /**