From 62f5154d234f5d2c331a001c97d0c287dbf11156 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Gaillard?=
 <francois.gaillard@prestashop.com>
Date: Fri, 15 Feb 2013 16:38:33 +0100
Subject: [PATCH] [-] MO : Bug fix : Removed &amp; from config file (XML
 parsing issues)

---
 itembase/config.xml   | 20 ++++++++++----------
 itembase/itembase.php |  2 +-
 stripejs/config.xml   |  2 +-
 stripejs/stripejs.php |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/itembase/config.xml b/itembase/config.xml
index bd255c831..871035a96 100644
--- a/itembase/config.xml
+++ b/itembase/config.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-        <module>
-            <name>itembase</name>
-            <displayName><![CDATA[itembase]]></displayName>
-            <version><![CDATA[2.0]]></version>
-            <description><![CDATA[itembase - Personal Shopping Manager &amp; Inventory (SEO links, Brand Booster, Traffic Source, Affiliate Channel)]]></description>
-            <author><![CDATA[itembase]]></author>
-            <tab><![CDATA[others]]></tab>
-            <is_configurable>1</is_configurable>
-            <need_instance>0</need_instance>
+<module>
+	<name>itembase</name>
+	<displayName><![CDATA[itembase]]></displayName>
+	<version><![CDATA[2.0]]></version>
+	<description><![CDATA[itembase - Personal Shopping Manager and Inventory (SEO links, Brand Booster, Traffic Source, Affiliate Channel)]]></description>
+	<author><![CDATA[itembase]]></author>
+	<tab><![CDATA[others]]></tab>
+	<is_configurable>1</is_configurable>
+	<need_instance>0</need_instance>
 	<limited_countries></limited_countries>
-        </module>
\ No newline at end of file
+</module>
\ No newline at end of file
diff --git a/itembase/itembase.php b/itembase/itembase.php
index 1e0ae4944..b8c7db84e 100755
--- a/itembase/itembase.php
+++ b/itembase/itembase.php
@@ -47,7 +47,7 @@ public function __construct()
 		parent::__construct();
 
 		$this->displayName = $this->l('itembase');
-		$this->description = $this->l('itembase - Personal Shopping Manager & Inventory (SEO links, Brand Booster, Traffic Source, Affiliate Channel)');
+		$this->description = $this->l('itembase - Personal Shopping Manager and Inventory (SEO links, Brand Booster, Traffic Source, Affiliate Channel)');
 		
 		if (self::isInstalled($this->name)){
 			$warnings = array();
diff --git a/stripejs/config.xml b/stripejs/config.xml
index 5b886b7d8..1a2ca0b6e 100755
--- a/stripejs/config.xml
+++ b/stripejs/config.xml
@@ -3,7 +3,7 @@
             <name>stripejs</name>
             <displayName><![CDATA[Stripe]]></displayName>
             <version><![CDATA[0.9.4]]></version>
-            <description><![CDATA[Accept payments by Credit Card with Stripe (Visa, Mastercard, Amex, Discover &amp; Diners Club)]]></description>
+            <description><![CDATA[Accept payments by Credit Card with Stripe (Visa, Mastercard, Amex, Discover and Diners Club)]]></description>
             <author><![CDATA[PrestaShop]]></author>
             <tab><![CDATA[payments_gateways]]></tab>
 	<confirmUninstall>Warning: all the Stripe customers credit cards and transaction details saved in your database will be deleted. Are you sure you want uninstall this module?</confirmUninstall>
diff --git a/stripejs/stripejs.php b/stripejs/stripejs.php
index 4cf8aecfc..325bfee6d 100755
--- a/stripejs/stripejs.php
+++ b/stripejs/stripejs.php
@@ -45,7 +45,7 @@ public function __construct()
 		parent::__construct();
 
 		$this->displayName = $this->l('Stripe');
-		$this->description = $this->l('Accept payments by Credit Card with Stripe (Visa, Mastercard, Amex, Discover & Diners Club)');
+		$this->description = $this->l('Accept payments by Credit Card with Stripe (Visa, Mastercard, Amex, Discover and Diners Club)');
 		$this->confirmUninstall = $this->l('Warning: all the Stripe customers credit cards and transaction details saved in your database will be deleted. Are you sure you want uninstall this module?');
 
 		/* Backward compatibility */