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

// Refactoring of shop class with new context Part 2

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7617 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-07-13 12:52:09 +00:00
parent c5cc771f16
commit 67c80b2b42
21 changed files with 189 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Configuration.php
+3 -3
View File
@@ -372,7 +372,7 @@ class ConfigurationCore extends ObjectModel
*/
public static function deleteFromContext($key)
{
list($shopID, $shopGroupID) = Shop::retrieveContext();
list($shopID, $shopGroupID) = Shop::getContext();
if (!$shopID && !$shopGroupID)
return;
@@ -395,7 +395,7 @@ class ConfigurationCore extends ObjectModel
*/
public static function hasContext($key, $langID, $context)
{
list($shopID, $shopGroupID) = Shop::retrieveContext();
list($shopID, $shopGroupID) = Shop::getContext();
if ($context == Shop::CONTEXT_SHOP && Configuration::hasKey($key, $langID, null, $shopID))
return true;
else if ($context == Shop::CONTEXT_GROUP && Configuration::hasKey($key, $langID, $shopGroupID))
@@ -424,7 +424,7 @@ class ConfigurationCore extends ObjectModel
*/
protected static function getShopFromContext(&$id_group_shop, &$id_shop)
{
list($shopID, $shopGroupID) = Shop::retrieveContext();
list($shopID, $shopGroupID) = Shop::getContext();
if (is_null($id_shop))
$id_shop = $shopID;
if (is_null($id_group_shop))