From bc07b025c1f14f10e92a61783e2218a6d94a3ce7 Mon Sep 17 00:00:00 2001
From: PrestaEdit <j.danse@prestaedit.com>
Date: Thu, 18 Apr 2013 14:45:52 +0300
Subject: [PATCH 1/3] [-] MO: feeder / RSS Valid

---
 modules/feeder/rss.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/feeder/rss.php b/modules/feeder/rss.php
index fad90e212..00874b76f 100644
--- a/modules/feeder/rss.php
+++ b/modules/feeder/rss.php
@@ -34,6 +34,7 @@ $id_category = ((int)(Tools::getValue('id_category')) ? (int)(Tools::getValue('i
 $products = Product::getProducts((int)Context::getContext()->language->id, 0, ($number > 10 ? 10 : $number), $orderBy, $orderWay, $id_category, true);
 $currency = new Currency((int)Context::getContext()->currency->id);
 $affiliate = (Tools::getValue('ac') ? '?ac='.(int)(Tools::getValue('ac')) : '');
+$metas = Meta::getMetaByPage('index', (int)Context::getContext()->language->id);
 
 // Send feed
 header("Content-Type:text/xml; charset=utf-8");
@@ -42,8 +43,9 @@ echo '<?xml version="1.0" encoding="UTF-8"?>'."\n";
 <rss version="2.0">
 	<channel>
 		<title><![CDATA[<?php echo Configuration::get('PS_SHOP_NAME') ?>]]></title>
+		<description><![CDATA[<?php echo $metas['description'] ?>]]></description
 		<link><?php echo _PS_BASE_URL_.__PS_BASE_URI__; ?></link>
-		<mail><?php echo Configuration::get('PS_SHOP_EMAIL') ?></mail>
+		<webMaster><?php echo Configuration::get('PS_SHOP_EMAIL') ?></webMaster>
 		<generator>PrestaShop</generator>
 		<language><?php echo Context::getContext()->language->iso_code; ?></language>
 		<image>

From 2d1c6514f315955ace92edc726228f7c461b1bfb Mon Sep 17 00:00:00 2001
From: PrestaEdit <j.danse@prestaedit.com>
Date: Tue, 30 Apr 2013 20:40:03 +0200
Subject: [PATCH 2/3] // fix </description>

---
 modules/feeder/rss.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/feeder/rss.php b/modules/feeder/rss.php
index 00874b76f..caa32a3c8 100644
--- a/modules/feeder/rss.php
+++ b/modules/feeder/rss.php
@@ -43,7 +43,7 @@ echo '<?xml version="1.0" encoding="UTF-8"?>'."\n";
 <rss version="2.0">
 	<channel>
 		<title><![CDATA[<?php echo Configuration::get('PS_SHOP_NAME') ?>]]></title>
-		<description><![CDATA[<?php echo $metas['description'] ?>]]></description
+		<description><![CDATA[<?php echo $metas['description'] ?>]]></description>
 		<link><?php echo _PS_BASE_URL_.__PS_BASE_URI__; ?></link>
 		<webMaster><?php echo Configuration::get('PS_SHOP_EMAIL') ?></webMaster>
 		<generator>PrestaShop</generator>

From 9e2c5bfcb9f99d19d65ca3db4eb7ea9adcc306e5 Mon Sep 17 00:00:00 2001
From: gRoussac <gregory.roussac@prestashop.com>
Date: Thu, 23 May 2013 16:14:31 +0200
Subject: [PATCH 3/3] [-] BO : Fix bug #PSCFI-6755 "+" in email

---
 js/sendMailTest.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/sendMailTest.js b/js/sendMailTest.js
index ad2b16444..f46a6542d 100644
--- a/js/sendMailTest.js
+++ b/js/sendMailTest.js
@@ -24,7 +24,7 @@
 */
 
 //constant
-verifMailREGEX = /^([\w-]+(?:\.[\w-]+)*)@((?:[\w-]+\.)*\w[\w-]{0,66})\.([a-z]{2,6}(?:\.[a-z]{2})?)$/;
+verifMailREGEX = /^([\w+-]+(?:\.[\w+-]+)*)@((?:[\w-]+\.)*\w[\w-]{0,66})\.([a-z]{2,6}(?:\.[a-z]{2})?)$/;
 
 function verifyMail(testMsg, testSubject)
 {