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

// Changed the name of a multishop variable to multishop_specific, in order to avoid confusion

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16293 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
dMetzger
2012-07-09 15:48:22 +00:00
parent 8343cb58d5
commit 649cb9af43
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
classes/controller/AdminController.php
View File

@@ -1998,7 +1998,7 @@ class AdminControllerCore extends Controller
if ($this->multishop_context && Shop::isTableAssociated($this->table) && !empty($this->className))
{
$def = ObjectModel::getDefinition($this->className);
if (Shop::getContext() != Shop::CONTEXT_ALL || !empty($def['multishop']) || !$this->context->employee->isSuperAdmin())
if (Shop::getContext() != Shop::CONTEXT_ALL || !empty($def['multishop_specific']) || !$this->context->employee->isSuperAdmin())
{
$idenfier_shop = Shop::getContextListShopID();
if (!$this->_group)
@@ -2383,7 +2383,7 @@ class AdminControllerCore extends Controller
return;
$def = ObjectModel::getDefinition($this->className);
if (!empty($def['multishop']))
if (!empty($def['multishop_specific']))
return;
if (!Shop::isTableAssociated($this->table))