Merge branch 'develop' into 2.0

getgrav · Aug 14, 2017 · f89fe0e · f89fe0e
2 parents ad5cddf + 04d7945
commit f89fe0e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/system/src/Grav/Common/Twig/Twig.php b/system/src/Grav/Common/Twig/Twig.php
@@ -367,7 +367,7 @@ public function processSite($format = null, array $vars = [])
      * @param $template_path
      * @param null $namespace
      */
-    public function addPath($template_path, $namespace = null)
+    public function addPath($template_path, $namespace = '__main__')
     {
         $this->loader->addPath($template_path, $namespace);
     }
@@ -377,7 +377,7 @@ public function addPath($template_path, $namespace = null)
      * @param $template_path
      * @param null $namespace
      */
-    public function prependPath($template_path, $namespace = null)
+    public function prependPath($template_path, $namespace = '__main__')
     {
         $this->loader->prependPath($template_path, $namespace);
     }