From c6d7fe06a0f2f51a6ab76f1613b0e6f18abfaa4a Mon Sep 17 00:00:00 2001 From: rMalie Date: Sat, 19 May 2012 12:49:04 +0000 Subject: [PATCH] // Fix check of duplicat urls for shops --- controllers/admin/AdminShopUrlController.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/controllers/admin/AdminShopUrlController.php b/controllers/admin/AdminShopUrlController.php index 865685353..70537a168 100644 --- a/controllers/admin/AdminShopUrlController.php +++ b/controllers/admin/AdminShopUrlController.php @@ -342,6 +342,10 @@ class AdminShopUrlControllerCore extends AdminController public function processSave() { + $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'); + $return = parent::processSave(); if (!$this->errors) Tools::generateHtaccess(); @@ -361,9 +365,6 @@ class AdminShopUrlControllerCore extends AdminController if (($object->main || Tools::getValue('main')) && !Tools::getValue('active')) $this->errors[] = Tools::displayError('You can\'t disable a Main URL'); - 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'); - parent::processAdd(); }