// small changes

controllers/front/CompareController.php

@@ -55,7 +55,7 @@ class CompareControllerCore extends FrontController
 			}
 			else if (Tools::getValue('action') == 'remove')
 			{
-				if (isset(self::$cookie->id_compare))
+				if (isset($this->context->cookie->id_compare))
 					CompareProduct::removeCompareProduct((int)$this->context->cookie->id_compare, (int)Tools::getValue('id_product'));
 				else
 					die('0');

controllers/front/OrderOpcController.php

@@ -323,7 +323,7 @@ class OrderOpcControllerCore extends ParentOrderController
 			'genders' => Gender::getGenders(),
 		));
 		/* Call a hook to display more information on form */
-		self::$smarty->assign(array(
+		$this->context->smarty->assign(array(
 			'HOOK_CREATE_ACCOUNT_FORM' => Hook::exec('displayCustomerAccountForm'),
 			'HOOK_CREATE_ACCOUNT_TOP' => Hook::exec('displayCustomerAccountFormTop')
 		));

controllers/front/StoresController.php

@@ -136,7 +136,7 @@ class StoresControllerCore extends FrontController
 			}
 			$smarty->assign('days_datas', $days_datas);
 			$smarty->assign('id_country', $store['id_country']);
-			return self::$smarty->fetch(_PS_THEME_DIR_.'store_infos.tpl');
+			return $this->context->smarty->fetch(_PS_THEME_DIR_.'store_infos.tpl');
 		}
 		return false;
 	}