Index: trunk/core/kernel/application.php =================================================================== diff -u -r3162 -r3177 --- trunk/core/kernel/application.php (.../application.php) (revision 3162) +++ trunk/core/kernel/application.php (.../application.php) (revision 3177) @@ -1032,12 +1032,7 @@ function ReplaceLanguageTags($text, $force_escape=null) { // !!!!!!!! - if( !is_object($this->Phrases) ) - { - print_r( debug_backtrace() ); -// $this->Debugger->appendTrace(); - } - +// if( !is_object($this->Phrases) ) $this->Debugger->appendTrace(); return $this->Phrases->ReplaceLanguageTags($text,$force_escape); } Index: trunk/core/kernel/utility/http_query.php =================================================================== diff -u -r3174 -r3177 --- trunk/core/kernel/utility/http_query.php (.../http_query.php) (revision 3174) +++ trunk/core/kernel/utility/http_query.php (.../http_query.php) (revision 3177) @@ -295,10 +295,10 @@ if(!$url_parts) { - $this->Application->VerifyLanguageId(); - $this->Application->VerifyThemeId(); $this->Application->Phrases = new PhrasesCache(); + $this->Application->VerifyLanguageId(); $this->Application->Phrases->Init('phrases'); + $this->Application->VerifyThemeId(); // $this->Get('m_lang') ); $this->Set('t', $this->getDefaultTemplate('') ); return false; @@ -309,6 +309,7 @@ // match language $sql = 'SELECT LanguageId FROM '.TABLE_PREFIX.'Language WHERE LOWER(PackName) = '.$this->Conn->qstr($url_part).' AND Enabled = 1'; $language_id = $this->Conn->GetOne($sql); + $this->Application->Phrases = new PhrasesCache(); if($language_id) { $this->Set('m_lang', $language_id); @@ -318,7 +319,6 @@ { $this->Application->VerifyLanguageId(); } - $this->Application->Phrases = new PhrasesCache(); $this->Application->Phrases->Init('phrases'); // $this->Get('m_lang') );