From dc4a70dcf9625cbdc7602459d6707e275b6bfa47 Mon Sep 17 00:00:00 2001
From: vAugagneur <vincent.augagneur@prestashop.com>
Date: Thu, 28 Feb 2013 18:25:13 +0100
Subject: [PATCH] //fixed small bug when added new Shop URL

---
 classes/shop/ShopUrl.php                     | 3 ++-
 controllers/admin/AdminShopUrlController.php | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/classes/shop/ShopUrl.php b/classes/shop/ShopUrl.php
index 2eb767287..62d43aaa9 100644
--- a/classes/shop/ShopUrl.php
+++ b/classes/shop/ShopUrl.php
@@ -124,10 +124,11 @@ class ShopUrlCore extends ObjectModel
 	public function canAddThisUrl($domain, $domain_ssl, $physical_uri, $virtual_uri)
 	{
 		$physical_uri = trim($physical_uri, '/');
+
 		if ($physical_uri)
 			$physical_uri = preg_replace('#/+#', '/', '/'.$physical_uri.'/');
 		else
-			$this->physical_uri = '/';
+			$physical_uri = '/';
 
 		$virtual_uri = trim($virtual_uri, '/');
 		if ($virtual_uri)
diff --git a/controllers/admin/AdminShopUrlController.php b/controllers/admin/AdminShopUrlController.php
index 1a15dc835..73799a862 100644
--- a/controllers/admin/AdminShopUrlController.php
+++ b/controllers/admin/AdminShopUrlController.php
@@ -360,6 +360,10 @@ class AdminShopUrlControllerCore extends AdminController
 	public function processAdd()
 	{
 		$object = $this->loadObject(true);
+				
+		if ($object->canAddThisUrl(Tools::getValue('domain'), Tools::getValue('domain_ssl'), Tools::getValue('physical_uri'), Tools::getValue('virtual_uri')))
+			$this->errors[] = Tools::displayError('A shop URL that use this domain and uri already exists');
+		
 		if ($object->id && Tools::getValue('main'))
 			$object->setMain();