Index: branches/5.0.x/core/kernel/db/db_tag_processor.php
===================================================================
diff -u -r12734 -r12871
--- branches/5.0.x/core/kernel/db/db_tag_processor.php	(.../db_tag_processor.php)	(revision 12734)
+++ branches/5.0.x/core/kernel/db/db_tag_processor.php	(.../db_tag_processor.php)	(revision 12871)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: db_tag_processor.php 12734 2009-10-20 19:28:11Z alex $
+* @version	$Id: db_tag_processor.php 12871 2009-11-03 14:17:09Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -2150,9 +2150,16 @@
 		if (!isset($language_code)) {
 			$language_code = 'en'; // defaut value
 
+			if ($this->Application->isAdmin) {
+				$language_id = $this->Application->Phrases->LanguageId;
+			}
+			else {
+				$language_id = $this->Application->GetDefaultLanguageId(); // $this->Application->GetVar('m_lang');
+			}
+
 			$sql = 'SELECT Locale
 					FROM '. $this->Application->getUnitOption('lang', 'TableName') . '
-					WHERE LanguageId = ' . $this->Application->GetDefaultLanguageId(); // $this->Application->GetVar('m_lang');
+					WHERE LanguageId = ' . $language_id;
 			$locale = strtolower( $this->Conn->GetOne($sql) );
 
 			if (file_exists(FULL_PATH . EDITOR_PATH . 'editor/lang/' . $locale . '.js')) {