Merge branch 'release/1.0.3'

Sommerregen · Oct 16, 2015 · 572172c · 572172c
2 parents e1a613e + 7bd1e13
commit 572172c
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 25 deletions.
diff --git a/.gitattributes b/.gitattributes
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1 @@
-assets/logo.svg
-*.xcf
+.idea
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# v1.0.3
+## 10/16/2015
+
+2. [](#improved)
+  * Disable `TraceableTwigEnvironment` for **Grav v0.9.43+** by default and added backwards-compatibility check [#2](https://github.com/Sommerregen/grav-plugin-themer/issues/2) (TraceableTwigEnvironment not found)
+
 # v1.0.2
 ## 09/08/2015
 

diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@
 * [Installation and Updates](#installation-and-updates)
 * [Usage](#usage)
 * [Contributing](#contributing)
-* [Licencse](#license)
+* [License](#license)
 
 ## About
 

diff --git a/blueprints.yaml b/blueprints.yaml
@@ -1,5 +1,5 @@
 name: Themer
-version: 1.0.2
+version: 1.0.3
 description: "This plugin enables you to use different themes on one site individual set per page or collection."
 icon: magic
 author:

diff --git a/themer.php b/themer.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Themer v1.0.2
+ * Themer v1.0.3
  *
  * This plugin enables you to use different themes on one site
  * individual set per page or collection.
@@ -9,7 +9,7 @@
  * http://benjamin-regler.de/license/
  *
  * @package     Themer
- * @version     1.0.2
+ * @version     1.0.3
  * @link        <https://github.com/sommerregen/grav-plugin-themer>
  * @author      Benjamin Regler <[email protected]>
  * @copyright   2015, Benjamin Regler
@@ -91,8 +91,9 @@ public function onPageInitialized()
         $twig->twig_paths = [];
         $twig->init();
 
-        // Update TwigCollector for DebugBar
-        if ($enabled && $debug) {
+        // Update TwigCollector for DebugBar (deprecated since Grav v0.9.43+)
+        $deprecated = version_compare(GRAV_VERSION, '0.9.43', '<');
+        if ($deprecated && $enabled && $debug) {
           $twig->twig = new TraceableTwigEnvironment($twig->twig);
           $collector = $this->grav['debugger']->getCollector('twig');
           $collector->twig = $twig->twig;