Index: trunk/admin/config/addlang_labels.php
===================================================================
diff -u -r954 -r962
--- trunk/admin/config/addlang_labels.php	(.../addlang_labels.php)	(revision 954)
+++ trunk/admin/config/addlang_labels.php	(.../addlang_labels.php)	(revision 962)
@@ -232,7 +232,7 @@
 $FilterLabels[1] = admin_language("la_Text_Admin");
 $FilterLabels[2] = admin_language("la_Text_Both");
 
-if(!is_object($objThemeList))
+if( !(isset($objThemeList)&&is_object($objThemeList)) )
 {
     $objThemeList = new clsThemeList();
 }
@@ -286,7 +286,7 @@
 
 $sql = "SELECT distinct(p.Phrase) as Phrase,p.Translation as Translation,ELT(p.PhraseType+1,'".admin_language("la_Text_Front")."','".admin_language("la_Text_Admin")."','".admin_language("la_Text_Both")."') as Type, ";
 $sql .="pri.Translation as PrimaryValue, p.PhraseId as PhraseId ";
-$sql .= "FROM ".$objPhrases->SourceTable." as p LEFT JOIN $ptable as pri ON (p.Phrase=pri.Phrase AND pri.LanguageId=1) WHERE p.LanguageId=".$c->Get("LanguageId")." ";
+$sql .= "FROM ".$objPhrases->SourceTable." as p LEFT JOIN $ptable as pri ON (p.Phrase=pri.Phrase AND pri.LanguageId=".$objLanguages->GetPrimary().") WHERE p.LanguageId=".$c->Get("LanguageId")." ";
 
 if(strlen($where))
     $sql .= "AND ".$where." ";