Fixed path incompatibilty problem with latest version of Twig

daveh · daveh · commit 63584e6b4e04 · 2016-10-19T21:07:13.000+02:00
diff --git a/Core/View.php b/Core/View.php
@@ -22,7 +22,7 @@ public static function render($view, $args = [])
     {
         extract($args, EXTR_SKIP);
 
-        $file = "../App/Views/$view";  // relative to Core directory
+        $file = dirname(__DIR__) . "/App/Views/$view");  // relative to Core directory
 
         if (is_readable($file)) {
             require $file;
@@ -44,7 +44,7 @@ public static function renderTemplate($template, $args = [])
         static $twig = null;
 
         if ($twig === null) {
-            $loader = new \Twig_Loader_Filesystem('../App/Views');
+            $loader = new \Twig_Loader_Filesystem(dirname(__DIR__) . '/App/Views');
             $twig = new \Twig_Environment($loader);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public static function render($view, $args = [])`
`22`	`22`	`{`
`23`	`23`	`extract($args, EXTR_SKIP);`
`24`	`24`
`25`		`-$file = "../App/Views/$view"; // relative to Core directory`
	`25`	`+$file = dirname(__DIR__) . "/App/Views/$view"); // relative to Core directory`
`26`	`26`
`27`	`27`	`if (is_readable($file)) {`
`28`	`28`	`require $file;`
`@@ -44,7 +44,7 @@ public static function renderTemplate($template, $args = [])`
`44`	`44`	`static $twig = null;`
`45`	`45`
`46`	`46`	`if ($twig === null) {`
`47`		`-$loader = new \Twig_Loader_Filesystem('../App/Views');`
	`47`	`+$loader = new \Twig_Loader_Filesystem(dirname(__DIR__) . '/App/Views');`
`48`	`48`	`$twig = new \Twig_Environment($loader);`
`49`	`49`	`}`
`50`	`50`