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

// Fix shop_url when no physical_uri + fix shop association when multistore is disactivated

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7958 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-08-09 13:20:26 +00:00
parent 47a4f7f31e
commit a86e95fc5a
6 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/tabs/AdminShopUrl.php
+1 -1
View File
@@ -61,7 +61,7 @@ class AdminShopUrl extends AdminTab
if ($beforeUpdate->main AND !Tools::getValue('main'))
$this->_errors[] = Tools::displayError('You must have a main url per shop');
}
if ($object->canAddThisUrl(Tools::getValue('domain'), Tools::getValue('domain_ssl'), Tools::getValue('uri')))
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');
Tools::generateHtaccess(dirname(__FILE__).'/../../.htaccess', Configuration::get('PS_REWRITING_SETTINGS'), Configuration::get('PS_HTACCESS_CACHE_CONTROL'), '');