making sure the date formats aren't empty

dmolsen · dmolsen · commit 8fd1df98fc3a · 2015-03-01T13:43:27.000-05:00
diff --git a/src/PatternLab/PatternEngine/Twig/TwigUtil.php b/src/PatternLab/PatternEngine/Twig/TwigUtil.php
@@ -29,8 +29,8 @@ public static function loadDateFormats($instance) {
 		$dateFormat     = Config::getOption("twigDefaultDateFormat");
 		$intervalFormat = Config::getOption("twigDefaultIntervalFormat");
 		
-		if ($dateFormat && $intervalFormat) {
-			$instance->getExtension('core')->setDateFormat($dateFormat, $intervalFormat);
+		if ($dateFormat && $intervalFormat && !empty($dateFormat) && !empty($intervalFormat)) {
+			$instance->getExtension("core")->setDateFormat($dateFormat, $intervalFormat);
 		}
 		
 		return $instance;

Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,8 @@ public static function loadDateFormats($instance) {`
`29`	`29`	`$dateFormat = Config::getOption("twigDefaultDateFormat");`
`30`	`30`	`$intervalFormat = Config::getOption("twigDefaultIntervalFormat");`
`31`	`31`
`32`		`- if ($dateFormat && $intervalFormat) {`
`33`		`- $instance->getExtension('core')->setDateFormat($dateFormat, $intervalFormat);`
	`32`	`+ if ($dateFormat && $intervalFormat && !empty($dateFormat) && !empty($intervalFormat)) {`
	`33`	`+ $instance->getExtension("core")->setDateFormat($dateFormat, $intervalFormat);`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`return $instance;`