diff --git a/.gitignore b/.gitignore index a695150c2..7b6b4b82a 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ log/* bin/* local/session/* coverage +.idea diff --git a/core/lib/Thelia/Core/Template/Parser.php b/core/lib/Thelia/Core/Template/Parser.php index d4f95d025..e6fe2b678 100644 --- a/core/lib/Thelia/Core/Template/Parser.php +++ b/core/lib/Thelia/Core/Template/Parser.php @@ -150,7 +150,6 @@ class Parser implements ParserInterface $content = $this->openFile($this->getRequest()); $this->tpex->init($this->container->get("request"), $this->container->get("dispatcher"), $content, THELIA_TEMPLATE_DIR . rtrim($this->template, "/") . "/"); - $this->tpex->setLogger(Tlog::getInstance()); $this->tpex->configure( array(), array(), diff --git a/core/lib/Thelia/Tpex b/core/lib/Thelia/Tpex index 4fb42f64f..c573391fd 160000 --- a/core/lib/Thelia/Tpex +++ b/core/lib/Thelia/Tpex @@ -1 +1 @@ -Subproject commit 4fb42f64f87fa3b1a056872e01947fbce199ede8 +Subproject commit c573391fd80d079d2a522d23b7f825e4feac0313 diff --git a/templates/default/index.html b/templates/default/index.html index 01e72c0a3..f3da716a9 100644 --- a/templates/default/index.html +++ b/templates/default/index.html @@ -1,7 +1,3 @@ -