浏览代码

Only load Twig_Extension_Debug when Twig's debug mode is enabled

Daniel Rudolf 8 年之前
父节点
当前提交
05c8d95b3f
共有 1 个文件被更改,包括 7 次插入2 次删除
  1. 7 2
      lib/Pico.php

+ 7 - 2
lib/Pico.php

@@ -1657,11 +1657,16 @@ class Pico
     public function getTwig()
     {
         if ($this->twig === null) {
+            $twigConfig = $this->getConfig('twig_config');
+
             $twigLoader = new Twig_Loader_Filesystem($this->getThemesDir() . $this->getConfig('theme'));
-            $this->twig = new Twig_Environment($twigLoader, $this->getConfig('twig_config'));
-            $this->twig->addExtension(new Twig_Extension_Debug());
+            $this->twig = new Twig_Environment($twigLoader, $twigConfig);
             $this->twig->addExtension(new PicoTwigExtension($this));
 
+            if (!empty($twigConfig['debug'])) {
+                $this->twig->addExtension(new Twig_Extension_Debug());
+            }
+
             // register content filter
             // we pass the $pages array by reference to prevent multiple parser runs for the same page
             // this is the reason why we can't register this filter as part of PicoTwigExtension