Index: trunk/kernel/include/language.php
===================================================================
diff -u -r3282 -r3330
--- trunk/kernel/include/language.php	(.../language.php)	(revision 3282)
+++ trunk/kernel/include/language.php	(.../language.php)	(revision 3330)
@@ -349,26 +349,22 @@
         $l->Set('PrimaryLang', 1); 
         $l->Set('Enabled', 1);       
         $l->Update();
-        $this->m_Primary =$lang_id;
+        $this->m_Primary = $lang_id;
     }
 
-    function GetPrimary($Field="LanguageId")
+    function GetPrimary($Field = 'LanguageId')
     {
-        if(!$this->m_Primary)
-        {        
-          $sql = "SELECT * FROM ".$this->SourceTable." WHERE PrimaryLang=1";       
-          $rs = $this->adodbConnection->Execute($sql);
-          if($rs && !$rs->EOF)
-          {
-            $l = $rs->fields[$Field];
-          }
-          else
-             $l = 0;
-          $this->m_Primary=$l;
-        }
-        else
-            $l = $this->m_Primary;        
-        return $l;
+    	static $skip_quering = false;
+    	if ($skip_quering) return $this->m_Primary;
+    	
+    	if(!$this->m_Primary)
+    	{
+    		$sql = 'SELECT '.$Field.' FROM '.$this->SourceTable.' WHERE PrimaryLang = 1';
+    		$this->m_Primary = $this->adodbConnection->GetOne($sql);
+    		$skip_quering = true;
+    	}
+    	
+    	return $this->m_Primary;
     }
     
     function LoadAllLanguages()