Index: trunk/admin/config/addlang.php
===================================================================
diff -u -N -r954 -r962
--- trunk/admin/config/addlang.php	(.../addlang.php)	(revision 954)
+++ trunk/admin/config/addlang.php	(.../addlang.php)	(revision 962)
@@ -117,7 +117,7 @@
 $objEditItems->EnablePaging = FALSE;
 $objPhraseList = new clsPhraseList();
 $objPhraseList->EnablePaging = FALSE;
-if ($_GET["new"] == 1)
+if( GetVar('new') )
 {
 	$c = new clsLanguage(NULL);
 	$c->Set("DecimalPoint",".");
Index: trunk/admin/config/addlang_labels.php
===================================================================
diff -u -N -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." ";
Index: trunk/new_phrases.txt
===================================================================
diff -u -N -r907 -r962
--- trunk/new_phrases.txt	(.../new_phrases.txt)	(revision 907)
+++ trunk/new_phrases.txt	(.../new_phrases.txt)	(revision 962)
@@ -88,6 +88,7 @@
 la_desc_emailevent_
 la_text_address_denied
 la_error_move_subcategory
+lu_items_since_last
 lu_close
 lu_pm_list_description
 lu_rate_access_denied
@@ -110,6 +111,7 @@
 lu_news_addreview_confirm__pending_text
 lu_news_search_results
 lu_enlarge_picture
+lu_article_name
 lu_confirm
 lu_confirmation_title
 lu_confirm_subtitle
Index: trunk/kernel/action.php
===================================================================
diff -u -N -r955 -r962
--- trunk/kernel/action.php	(.../action.php)	(revision 955)
+++ trunk/kernel/action.php	(.../action.php)	(revision 962)
@@ -1389,12 +1389,12 @@
          $objEditItems->SourceTable = $objSession->GetEditTable("Language");
          
          $objEditItems->EditLanguage($_POST["LanguageId"],$_POST["packname"],
-                                     $_POST["localname"],(int)$_POST["enabled"],
-                                     (int)$_POST["primary"], $_POST["icon"],$_POST["date_format"],
+                                     $_POST["localname"],(int)GetVar('enabled'),
+                                     (int)GetVar('primary'), $_POST["icon"],$_POST["date_format"],
                                      $_POST["time_format"], $_POST["decimal"],$_POST["thousand"],
                                      $_POST['charset']);
                                      
-         if($_POST["importlabels"]==1 && $_POST["srcpack"]>0)
+         if( GetVar('importlabels') && $_POST["srcpack"]>0)
          {            
             $rs = $ado->Execute("SELECT * FROM ".GetTablePrefix()."Phrase WHERE LanguageId=".$_POST["srcpack"]);
             $plist = new clsPhraseList();
Index: trunk/kernel/include/theme.php
===================================================================
diff -u -N -r889 -r962
--- trunk/kernel/include/theme.php	(.../theme.php)	(revision 889)
+++ trunk/kernel/include/theme.php	(.../theme.php)	(revision 962)
@@ -589,15 +589,15 @@
         $this->AdminSearchFields = array("Name","Description"); 
     }
 
-    function LoadThemes($where="",$order="")
+    function LoadThemes($where='',$orderBy='')
     {
         global $objConfig;
 
         $this->Clear();
         $sql = "SELECT * FROM ".$this->SourceTable."  ";
-        if(strlen(trim($where)))
+        if(trim($where))
             $sql .= "WHERE ".$where." ";
-        if(strlen(trim($orderBy)))
+        if(trim($orderBy))
            $sql .= "ORDER BY $orderBy";
         
         $sql .= GetLimitSQL($this->Page,$objConfig->Get($this->PerPageVar));