dinislage/PrestaShop
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

//fixed small bug when added new Shop URL

Browse Source
This commit is contained in:
vAugagneur committed 2013-02-28 18:25:13 +01:00
1 parent 2011cdb735
commit 585a049d16
2 files changed
+6 -1
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

classes/shop/ShopUrl.php
+2 -1
View File
@@ -124,10 +124,11 @@ class ShopUrlCore extends ObjectModel
public function canAddThisUrl($domain, $domain_ssl, $physical_uri, $virtual_uri) public function canAddThisUrl($domain, $domain_ssl, $physical_uri, $virtual_uri)
{ {
$physical_uri = trim($physical_uri, '/'); $physical_uri = trim($physical_uri, '/');
if ($physical_uri) if ($physical_uri)
$physical_uri = preg_replace('#/+#', '/', '/'.$physical_uri.'/'); $physical_uri = preg_replace('#/+#', '/', '/'.$physical_uri.'/');
else else
$this->physical_uri = '/'; $physical_uri = '/';
$virtual_uri = trim($virtual_uri, '/'); $virtual_uri = trim($virtual_uri, '/');
if ($virtual_uri) if ($virtual_uri)
controllers/admin/AdminShopUrlController.php
+4
View File
@@ -360,6 +360,10 @@ class AdminShopUrlControllerCore extends AdminController
public function processAdd() public function processAdd()
{ {
$object = $this->loadObject(true); $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')) if ($object->id && Tools::getValue('main'))
$object->setMain(); $object->setMain();