From 95fd54d90942bd4c003763a67d4ea377d85440da Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Sun, 25 Oct 2015 16:49:28 -0600
Subject: [PATCH] Moved grav variable into globals and removed from template
 variables

---
 system/src/Grav/Common/Twig/Twig.php          |  1 -
 system/src/Grav/Common/Twig/TwigExtension.php | 12 ++++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/system/src/Grav/Common/Twig/Twig.php b/system/src/Grav/Common/Twig/Twig.php
index 5b2319561..c983a76f4 100644
--- a/system/src/Grav/Common/Twig/Twig.php
+++ b/system/src/Grav/Common/Twig/Twig.php
@@ -142,7 +142,6 @@ class Twig
 
             // Set some standard variables for twig
             $this->twig_vars = array(
-                'grav' => $this->grav,
                 'config' => $config,
                 'uri' => $this->grav['uri'],
                 'base_dir' => rtrim(ROOT_DIR, '/'),
diff --git a/system/src/Grav/Common/Twig/TwigExtension.php b/system/src/Grav/Common/Twig/TwigExtension.php
index 9424e8f87..2da411210 100644
--- a/system/src/Grav/Common/Twig/TwigExtension.php
+++ b/system/src/Grav/Common/Twig/TwigExtension.php
@@ -36,6 +36,18 @@ class TwigExtension extends \Twig_Extension
         return 'GravTwigExtension';
     }
 
+    /**
+     * Register some standard globals
+     *
+     * @return array
+     */
+    public function getGlobals()
+    {
+        return array(
+            'grav' => $this->grav,
+        );
+    }
+
     /**
      * Return a list of all filters.
      *