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

// Fix little bug

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11078 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rGaillard
2011-12-09 14:18:13 +00:00
parent 5b36a76462
commit 43ff904c57
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Tools.php
+1 -1
View File
@@ -1517,7 +1517,7 @@ class ToolsCore
foreach (ShopUrl::getShopUrls() as $shop_url) foreach (ShopUrl::getShopUrls() as $shop_url)
{ {
if (!isset($domains[$shop_url->domain])) if (!isset($domains[$shop_url->domain]))
$domains[$shop_url['domain']] = array(); $domains[$shop_url->domain] = array();
$domains[$shop_url->domain][] = array( $domains[$shop_url->domain][] = array(
'physical' => $shop_url->physical_uri, 'physical' => $shop_url->physical_uri,
controllers/admin/AdminShopUrlController.php
+4 -3
View File
@@ -254,9 +254,10 @@ class AdminShopUrlControllerCore extends AdminController
$this->_errors[] = Tools::displayError('A shop url that use this domain and uri already exists'); $this->_errors[] = Tools::displayError('A shop url that use this domain and uri already exists');
parent::postProcess(); parent::postProcess();
Tools::generateHtaccess(dirname(__FILE__).'/../../.htaccess', Configuration::get('PS_REWRITING_SETTINGS'), Configuration::get('PS_HTACCESS_CACHE_CONTROL'), ''); if (!$this->_errors)
Tools::generateHtaccess(dirname(__FILE__).'/../../.htaccess', Configuration::get('PS_REWRITING_SETTINGS'), Configuration::get('PS_HTACCESS_CACHE_CONTROL'), '');
} }
else if ((isset($_GET['status'.$this->table]) || isset($_GET['status'])) && Tools::getValue($this->identifier)) elseif ((isset($_GET['status'.$this->table]) || isset($_GET['status'])) && Tools::getValue($this->identifier))
{ {
if ($this->tabAccess['edit'] === '1') if ($this->tabAccess['edit'] === '1')
{ {
@@ -264,7 +265,7 @@ class AdminShopUrlControllerCore extends AdminController
{ {
if ($object->main) if ($object->main)
$this->_errors[] = Tools::displayError('You can\'t disable a main url'); $this->_errors[] = Tools::displayError('You can\'t disable a main url');
else if ($object->toggleStatus()) elseif ($object->toggleStatus())
Tools::redirectAdmin(self::$currentIndex.'&conf=5&token='.$token); Tools::redirectAdmin(self::$currentIndex.'&conf=5&token='.$token);
else else
$this->_errors[] = Tools::displayError('An error occurred while updating status.'); $this->_errors[] = Tools::displayError('An error occurred while updating status.');