From 9b165483d91f56ae5af0c78e1588e717a152129c Mon Sep 17 00:00:00 2001 From: Etienne Roudeix Date: Mon, 2 Dec 2013 13:16:14 +0100 Subject: [PATCH] fix tax engine instance --- core/lib/Thelia/TaxEngine/TaxEngine.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/core/lib/Thelia/TaxEngine/TaxEngine.php b/core/lib/Thelia/TaxEngine/TaxEngine.php index 547cac9bd..9e2f1909d 100755 --- a/core/lib/Thelia/TaxEngine/TaxEngine.php +++ b/core/lib/Thelia/TaxEngine/TaxEngine.php @@ -42,13 +42,16 @@ class TaxEngine */ protected $session = null; - static public function getInstance(Session $session) + static public function getInstance(Session $session = null) { if(null === self::$instance) { self::$instance = new TaxEngine(); } - self::$instance->setSession($session); + if(null !== self::$instance) { + self::$instance->setSession($session); + } + return self::$instance; }