// Some fix + multistore for import tools
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7546 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
@@ -237,13 +237,13 @@ abstract class ObjectModelCore
|
||||
}
|
||||
}
|
||||
|
||||
if(!Tools::isMultishopActivated())
|
||||
if (!Tools::isMultishopActivated())
|
||||
{
|
||||
if (isset($assos[$this->table]) && $assos[$this->table]['type'] == 'shop')
|
||||
$result &= $this->associateTo(array((int)Shop::getCurrentShop(true)), 'shop');
|
||||
$result &= $this->associateTo(Shop::getCurrentShop(true), 'shop');
|
||||
$assos = GroupShop::getAssoTables();
|
||||
if (isset($assos[$this->table]) && $assos[$this->table]['type'] == 'group_shop')
|
||||
$result &= $this->associateTo(array((int)Shop::getCurrentGroupShop()), 'group_shop');
|
||||
$result &= $this->associateTo(Shop::getCurrentGroupShop(), 'group_shop');
|
||||
}
|
||||
return $result;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user