// Some fix after merge

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7781 b9a71923-0436-4b27-9f14-aed3839534dd

admin-dev/init.php

@@ -28,6 +28,7 @@
 ob_start();
 $timerStart = microtime(true);
 
+$context = Context::getContext();
 if (isset($_GET['logout']))
 	$cookie->logout();
 

config/config.inc.php

@@ -97,7 +97,7 @@ Configuration::loadConfiguration();
 Language::loadLanguages();
 
 /* Loading default country */
-$defaultCountry = new Country((int)(Configuration::get('PS_COUNTRY_DEFAULT')), Configuration::get('PS_LANG_DEFAULT'));
+$defaultCountry = new Country(Configuration::get('PS_COUNTRY_DEFAULT'), Configuration::get('PS_LANG_DEFAULT'));
 
 /* Instantiate cookie */
 if (defined('PS_ADMIN_DIR'))

controllers/OrderDetailController.php

@@ -42,7 +42,6 @@ class OrderDetailControllerCore extends FrontController
 	public function preProcess()
 	{
 		parent::preProcess();
-		
 
 		if (Tools::isSubmit('submitMessage'))
 		{
@@ -74,7 +73,7 @@ class OrderDetailControllerCore extends FrontController
 						$to = strval($to->email);
 					}
 					$toName = strval(Configuration::get('PS_SHOP_NAME'));
-					$customer = $context->customer->id;
+					$customer = $this->context->customer->id;
 					if (Validate::isLoadedObject($customer))
 						Mail::Send($this->context->language->id, 'order_customer_comment', Mail::l('Message from a customer'),
 						array(

controllers/ProductController.php

@@ -209,7 +209,7 @@ class ProductControllerCore extends FrontController
 					'ecotax_tax_exc' => Tools::ps_round($this->product->ecotax, 2),
 					'ecotaxTax_rate' => $ecotax_rate,
 					'homeSize' => Image::getSize('home'),
-					'product_manufacturer' => new Manufacturer((int)$this->product->id_manufacturer, $context->language->id),
+					'product_manufacturer' => new Manufacturer((int)$this->product->id_manufacturer, $this->context->language->id),
 					'token' => Tools::getToken(false),
 					'productPriceWithoutEcoTax' => (float)$productPriceWithoutEcoTax,
 					'features' => $features,