// Fix context initialization

2012-02-23 16:15:31 +00:00
parent 8b82363ef0
commit 5cebf4f5f2
2 changed files with 2 additions and 0 deletions
@@ -88,6 +88,7 @@ if (!isset($_SERVER['HTTP_HOST']) || empty($_SERVER['HTTP_HOST']))

 /* Initialize the current Shop */
 Context::getContext()->shop = Shop::initialize();
+Shop::setContext(Shop::CONTEXT_SHOP, Context::getContext()->shop->id);
 define('_THEME_NAME_', Context::getContext()->shop->getTheme());
 define('__PS_BASE_URI__', Context::getContext()->shop->getBaseURI());

@@ -62,6 +62,7 @@ class InstallControllerHttpProcess extends InstallControllerHttp
 		global $smarty;

 		Context::getContext()->shop = new Shop(1);
+		Shop::setContext(Shop::CONTEXT_SHOP, 1);
 		Configuration::loadConfiguration();
 		Context::getContext()->language = new Language(Configuration::get('PS_LANG_DEFAULT'));
 		Context::getContext()->country = new Country('PS_COUNTRY_DEFAULT');