// Fix check of duplicat urls for shops

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15435 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2012-05-19 12:49:04 +00:00
parent c9ddab2cf5
commit 787b320031
+4 -3
View File
@@ -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();
}