Index: trunk/core/kernel/application.php
===================================================================
diff -u -r3330 -r3344
--- trunk/core/kernel/application.php	(.../application.php)	(revision 3330)
+++ trunk/core/kernel/application.php	(.../application.php)	(revision 3344)
@@ -157,7 +157,7 @@
 	* Initializes the Application
  	*
  	* @access public
-	* @see HTTPQuery
+	* @see kHTTPQuery
 	* @see Session
 	* @see TemplatesCache
 	* @return bool Was Init actually made now or before
@@ -204,18 +204,14 @@
 
 		// Module items are recalled during url parsing & PhrasesCache is needed already there,
 		// because it's used in their build events. That's why phrases cache initialization is
-		// called from httpquery in case when mod_rewrite is used
+		// called from kHTTPQuery in case when mod_rewrite is used
 		if( !$this->RewriteURLs() )
 		{
 			$this->Phrases = new PhrasesCache();
 			$this->VerifyLanguageId();
 			$this->Phrases->Init('phrases');
 			$this->VerifyThemeId();
 		}
-
-		$this->SetVar('lang.current_id', $this->GetVar('m_lang') );
-		$this->SetVar('theme.current_id', $this->GetVar('m_theme') );
-		if( $this->GetVar('m_cat_id') === false ) $this->SetVar('m_cat_id', 0);
 		
 		if( !$this->RecallVar('UserGroups') )
 		{
@@ -225,6 +221,7 @@
 			$this->StoreVar('UserGroups', $user_groups);
 		}
 
+		if( $this->GetVar('m_cat_id') === false ) $this->SetVar('m_cat_id', 0);
 		if( !$this->RecallVar('curr_iso') ) $this->StoreVar('curr_iso', $this->GetPrimaryCurrency() );
 
 		$this->SetVar('visits_id', $this->RecallVar('visit_id') );
@@ -260,6 +257,7 @@
 		{
 			$this->SetVar('m_lang', $this->GetDefaultLanguageId() );
 		}
+		$this->SetVar('lang.current_id', $this->GetVar('m_lang') );
 	}
 
 	/**
@@ -280,6 +278,7 @@
 		{
 			$this->SetVar('m_theme', $this->GetDefaultThemeId() );
 		}
+		$this->SetVar('theme.current_id', $this->GetVar('m_theme') );
 	}
 
 	function GetDefaultLanguageId()
@@ -342,7 +341,7 @@
 
 		$this->registerClass('Params', KERNEL_PATH.'/utility/params.php', 'kFilenamesCache');
 
-		$this->registerClass('HTTPQuery', KERNEL_PATH.'/utility/http_query.php', 'HTTPQuery', Array('Params') );
+		$this->registerClass('kHTTPQuery', KERNEL_PATH.'/utility/http_query.php', 'HTTPQuery', Array('Params') );
 
 		$this->registerClass('Session', KERNEL_PATH.'/session/session.php');
 		$this->registerClass('SessionStorage', KERNEL_PATH.'/session/session.php');
@@ -636,7 +635,7 @@
 	}
 
 	/**
-	 * Deletes HTTPQuery variable
+	 * Deletes kHTTPQuery variable
 	 *
 	 * @param string $var
 	 * @todo think about method name