// Fix synchronisation of images in new installer

install-new/classes/xmlLoader.php

@@ -828,9 +828,9 @@ class InstallXmlLoader
 				if (!is_dir($this->lang_path.$iso.'/data'))
 					mkdir($this->lang_path.$iso.'/data');
 
-				$xml = new SimpleXMLElement('<entity_'.$entity.' />');
-				$this->createXmlEntityNodes($entity, $nodes, $xml);
-				$this->writeNiceAndSweetXML($xml, $this->lang_path.$iso.'/data/'.$entity.'.xml');
+				$xml_node = new SimpleXMLElement('<entity_'.$entity.' />');
+				$this->createXmlEntityNodes($entity, $nodes, $xml_node);
+				$this->writeNiceAndSweetXML($xml_node, $this->lang_path.$iso.'/data/'.$entity.'.xml');
 			}
 
 		if ($xml->fields['image'])

install-new/data/xml/configuration.xml

@@ -192,13 +192,13 @@
       <value>0</value>
     </configuration>
     <configuration id="PS_1_3_UPDATE_DATE" name="PS_1_3_UPDATE_DATE">
-      <value>2011-12-21 19:11:28</value>
+      <value>2011-12-22 10:17:01</value>
     </configuration>
     <configuration id="PS_PRICE_ROUND_MODE" name="PS_PRICE_ROUND_MODE">
       <value>2</value>
     </configuration>
     <configuration id="PS_1_3_2_UPDATE_DATE" name="PS_1_3_2_UPDATE_DATE">
-      <value>2011-12-21 19:11:28</value>
+      <value>2011-12-22 10:17:01</value>
     </configuration>
     <configuration id="PS_CONDITIONS_CMS_ID" name="PS_CONDITIONS_CMS_ID">
       <value>3</value>
@@ -342,7 +342,7 @@
       <value>1</value>
     </configuration>
     <configuration id="PS_IMG_UPDATE_TIME" name="PS_IMG_UPDATE_TIME">
-      <value>1324491088</value>
+      <value>1324545421</value>
     </configuration>
     <configuration id="PS_BACKUP_DROP_TABLE" name="PS_BACKUP_DROP_TABLE">
       <value>1</value>
@@ -840,7 +840,7 @@
       <value>1.5.0.2</value>
     </configuration>
     <configuration id="PS_SHOP_NAME" name="PS_SHOP_NAME">
-      <value>PrestaShop</value>
+      <value>Test</value>
     </configuration>
     <configuration id="PS_SHOP_EMAIL" name="PS_SHOP_EMAIL">
       <value>raphael.malie@gmail.com</value>
@@ -849,7 +849,7 @@
       <value>1</value>
     </configuration>
     <configuration id="PS_SHOP_ACTIVITY" name="PS_SHOP_ACTIVITY">
-      <value>10</value>
+      <value>2</value>
     </configuration>
   </entities>
 </entity_configuration>

install-new/fixtures/apple/data/category.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_category>
-  <fields id="name" class="Category" sql="a.id_category &gt; 1">
+  <fields id="name" class="Category" sql="a.id_category &gt; 1" image="c">
     <field name="id_parent" relation="category"/>
     <field name="active"/>
   </fields>

install-new/fixtures/apple/data/customer.xml

@@ -19,7 +19,7 @@
     <field name="is_guest"/>
   </fields>
   <entities>
-    <customer id="John" id_gender="Mr" id_default_group="3" firstname="John" lastname="DOE" passwd="ed2748bb0c8af6b7265f757f57d42d1a" last_passwd_gen="2011-12-21 19:11:28" birthday="1970-01-15" newsletter="1" ip_registration_newsletter="" newsletter_date_add="" optin="1" secure_key="47ce86627c1f3c792a80773c5d2deaf8" active="1" is_guest="0">
+    <customer id="John" id_gender="Mr" id_default_group="3" firstname="John" lastname="DOE" passwd="03c1ae6b8706086bd29c3b05e49b8488" last_passwd_gen="2011-12-22 10:17:01" birthday="1970-01-15" newsletter="1" ip_registration_newsletter="" newsletter_date_add="" optin="1" secure_key="47ce86627c1f3c792a80773c5d2deaf8" active="1" is_guest="0">
       <email>pub@prestashop.com</email>
       <note/>
     </customer>