Moved grav variable into globals and removed from template variables

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, '/'),

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.
      *