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
classes/AdminTab.php
+4 -1
View File
@@ -872,6 +872,9 @@ abstract class AdminTabCore
protected function updateAssoShop($id_object = false)
{
if (!Shop::isMultiShopActivated())
return ;
$shopAsso = Shop::getAssoTables();
$groupShopAsso = GroupShop::getAssoTables();
if (isset($shopAsso[$this->table]) && $shopAsso[$this->table]['type'] == 'shop')
@@ -1300,7 +1303,7 @@ abstract class AdminTabCore
else if (!preg_match('#(\s|,)\s*a\.`?'.pSQL($this->identifier).'`?(\s|,|$)#', $this->_group))
$this->_group .= ', a.'.pSQL($this->identifier);
if (Shop::isMultiShopActivated() && Shop::context() == Shop::CONTEXT_ALL)
if (Shop::isMultiShopActivated() && Context::shop() == Shop::CONTEXT_ALL)
$filterShop = 'JOIN `'._DB_PREFIX_.$this->table.'_'.$filterKey.'` sa ON (sa.'.$this->identifier.' = a.'.$this->identifier.' AND sa.id_'.$filterKey.' IN ('.implode(', ', $idenfierShop).'))';
}