From 3ef352a73ca76061e41f15886b21b187733274f9 Mon Sep 17 00:00:00 2001
From: rMalie <raphael.malie@prestashop.com>
Date: Tue, 27 Dec 2011 17:48:22 +0000
Subject: [PATCH] // Fix default lang in installer and admin tabs

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11815 b9a71923-0436-4b27-9f14-aed3839534dd
---
 install-new/classes/xmlLoader.php      | 2 +-
 install-new/data/xml/configuration.xml | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/install-new/classes/xmlLoader.php b/install-new/classes/xmlLoader.php
index 242201f6d..10f8ec0f6 100644
--- a/install-new/classes/xmlLoader.php
+++ b/install-new/classes/xmlLoader.php
@@ -501,7 +501,7 @@ class InstallXmlLoader
 			}
 		}
 
-		$this->storeId($entity, $identifier, $entity_id);
+		return $entity_id;
 	}
 
 	public function generatePrimary($entity, $primary)
diff --git a/install-new/data/xml/configuration.xml b/install-new/data/xml/configuration.xml
index ca7720805..7253c0537 100644
--- a/install-new/data/xml/configuration.xml
+++ b/install-new/data/xml/configuration.xml
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_configuration>
-  <fields id="name" null="1">
+  <fields id="name" sql="a.name &lt;&gt; 'PS_LANG_DEFAULT'" null="1">
     <field name="name"/>
     <field name="value"/>
   </fields>
   <entities>
-    <configuration id="PS_LANG_DEFAULT" name="PS_LANG_DEFAULT">
-      <value>2</value>
-    </configuration>
     <configuration id="PS_CURRENCY_DEFAULT" name="PS_CURRENCY_DEFAULT">
       <value>1</value>
     </configuration>