From c829ac5b7d7bc13410d84b6b2a6cb6d92bb779b4 Mon Sep 17 00:00:00 2001 From: Damien Metzger Date: Tue, 23 Jul 2013 14:19:13 +0200 Subject: [PATCH] // Fixed fix --- classes/order/Order.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/classes/order/Order.php b/classes/order/Order.php index ab500d99e..5d716146a 100644 --- a/classes/order/Order.php +++ b/classes/order/Order.php @@ -254,7 +254,9 @@ class OrderCore extends ObjectModel public function __construct($id = null, $id_lang = null) { parent::__construct($id, $id_lang); - if ($this->id_customer && Context::getContext()->controller->controller_type != 'admin') + + $is_admin = (is_object(Context::getContext()->controller) && Context::getContext()->controller->controller_type == 'admin'); + if ($this->id_customer && !$is_admin) { $customer = new Customer((int)($this->id_customer)); $this->_taxCalculationMethod = Group::getPriceDisplayMethod((int)$customer->id_default_group);