Index: trunk/kernel/units/languages/languages_tag_processor.php
===================================================================
diff -u -r2604 -r3115
--- trunk/kernel/units/languages/languages_tag_processor.php	(.../languages_tag_processor.php)	(revision 2604)
+++ trunk/kernel/units/languages/languages_tag_processor.php	(.../languages_tag_processor.php)	(revision 3115)
@@ -1,8 +1,8 @@
 <?php
 
-	class LanguagesTagProcessor extends kDBTagProcessor 
+	class LanguagesTagProcessor extends kDBTagProcessor
 	{
-	
+
 		/**
 		 * Guesses what charset should be used:
 		 * 1. use lang.current_Field field="Charset" by default
@@ -14,17 +14,17 @@
 		function GetCharset($params)
 		{
 			$edit_direct = $this->Application->GetVar('phrases_label');
-			
+
 			$top_prefix = $this->Application->GetTopmostPrefix($this->Prefix);
 			if( $this->Application->GetVar($top_prefix.'_mode') == 't' && !$edit_direct )
 			{
 				$object =& $this->Application->recallObject($this->getPrefixSpecial(), $this->Prefix, $params);
-				return $object->GetDBField('Charset');	
+				return $object->GetDBField('Charset');
 			}
 			$lang_current =& $this->Application->recallObject('lang.current');
 			return $lang_current->GetDBField('Charset');
 		}
-		
+
 		function ListLanguages($params)
 		{
 			$this->Special = 'enabled';
@@ -34,10 +34,9 @@
 		function SelectedLanguage($params)
 		{
 			$object =& $this->Application->recallObject($this->getPrefixSpecial());
-		
-			return $object->GetDBField('LanguageId') == $this->Application->RecallVar('m_lang');
+			return $object->GetDBField('LanguageId') == $this->Application->GetVar('m_lang');
 		}
-		
+
 		/**
 		 * Returns path where exported languages should be saved
 		 *
@@ -48,21 +47,21 @@
 			$admin_folder = $this->Application->ConfigValue('AdminDirectory');
 			if(!$admin_folder) $admin_folder = 'admin';
 			$ret = FULL_PATH.'/'.$admin_folder.'/export/';
-			
+
 			if( getArrayValue($params,'as_url') )
 			{
-				$ret = str_replace( FULL_PATH.'/', $this->Application->BaseURL(), $ret);	
+				$ret = str_replace( FULL_PATH.'/', $this->Application->BaseURL(), $ret);
 			}
 			return $ret;
 		}
-		
+
 /*		function Main_IsMetricUnits($params)
 		{
 			$object =& $this->Application->recallObject($this->Prefix.'.current');
 			$measure_system = $object->GetDBField('UnitSystem');
 			return $measure_system == 1 ? 1 : 0;
 		}*/
-		
+
 	}
 
 ?>
\ No newline at end of file
Index: trunk/core/units/languages/languages_tag_processor.php
===================================================================
diff -u -r2604 -r3115
--- trunk/core/units/languages/languages_tag_processor.php	(.../languages_tag_processor.php)	(revision 2604)
+++ trunk/core/units/languages/languages_tag_processor.php	(.../languages_tag_processor.php)	(revision 3115)
@@ -1,8 +1,8 @@
 <?php
 
-	class LanguagesTagProcessor extends kDBTagProcessor 
+	class LanguagesTagProcessor extends kDBTagProcessor
 	{
-	
+
 		/**
 		 * Guesses what charset should be used:
 		 * 1. use lang.current_Field field="Charset" by default
@@ -14,17 +14,17 @@
 		function GetCharset($params)
 		{
 			$edit_direct = $this->Application->GetVar('phrases_label');
-			
+
 			$top_prefix = $this->Application->GetTopmostPrefix($this->Prefix);
 			if( $this->Application->GetVar($top_prefix.'_mode') == 't' && !$edit_direct )
 			{
 				$object =& $this->Application->recallObject($this->getPrefixSpecial(), $this->Prefix, $params);
-				return $object->GetDBField('Charset');	
+				return $object->GetDBField('Charset');
 			}
 			$lang_current =& $this->Application->recallObject('lang.current');
 			return $lang_current->GetDBField('Charset');
 		}
-		
+
 		function ListLanguages($params)
 		{
 			$this->Special = 'enabled';
@@ -34,10 +34,9 @@
 		function SelectedLanguage($params)
 		{
 			$object =& $this->Application->recallObject($this->getPrefixSpecial());
-		
-			return $object->GetDBField('LanguageId') == $this->Application->RecallVar('m_lang');
+			return $object->GetDBField('LanguageId') == $this->Application->GetVar('m_lang');
 		}
-		
+
 		/**
 		 * Returns path where exported languages should be saved
 		 *
@@ -48,21 +47,21 @@
 			$admin_folder = $this->Application->ConfigValue('AdminDirectory');
 			if(!$admin_folder) $admin_folder = 'admin';
 			$ret = FULL_PATH.'/'.$admin_folder.'/export/';
-			
+
 			if( getArrayValue($params,'as_url') )
 			{
-				$ret = str_replace( FULL_PATH.'/', $this->Application->BaseURL(), $ret);	
+				$ret = str_replace( FULL_PATH.'/', $this->Application->BaseURL(), $ret);
 			}
 			return $ret;
 		}
-		
+
 /*		function Main_IsMetricUnits($params)
 		{
 			$object =& $this->Application->recallObject($this->Prefix.'.current');
 			$measure_system = $object->GetDBField('UnitSystem');
 			return $measure_system == 1 ? 1 : 0;
 		}*/
-		
+
 	}
 
 ?>
\ No newline at end of file