providing correct paths and clean names

dmolsen · dmolsen · commit 46bec4f4c10e · 2015-03-01T13:02:16.000-05:00
diff --git a/src/PatternLab/PatternEngine/Twig/TwigUtil.php b/src/PatternLab/PatternEngine/Twig/TwigUtil.php
@@ -39,7 +39,7 @@ public static function loadMacros($instance, $instanceType) {
 			$finder->files()->name("*.".$macroExt)->in($macroDir);
 			$finder->sortByName();
 			foreach ($finder as $file) {
-				$instance->addGlobal($file->getBasename($macroExt), $twig->loadTemplate($file->getRealPath()));
+				$instance->addGlobal($file->getBasename(".".$macroExt), $instance->loadTemplate($file->getBasename()));
 			}
 			
 		} else {

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public static function loadMacros($instance, $instanceType) {`
`39`	`39`	`$finder->files()->name("*.".$macroExt)->in($macroDir);`
`40`	`40`	`$finder->sortByName();`
`41`	`41`	`foreach ($finder as $file) {`
`42`		`- $instance->addGlobal($file->getBasename($macroExt), $twig->loadTemplate($file->getRealPath()));`
	`42`	`+ $instance->addGlobal($file->getBasename(".".$macroExt), $instance->loadTemplate($file->getBasename()));`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`} else {`