fixing the config init

dmolsen · dmolsen · commit 7cb258e7feea · 2016-06-19T21:25:47.000-04:00
diff --git a/src/PatternLab/Config.php b/src/PatternLab/Config.php
@@ -155,7 +155,7 @@ public static function init($baseDir = "", $verbose = true) {
 		// set the default config using the pattern lab config
 		try {
 			$defaultOptions = Yaml::parse(file_get_contents(self::$plConfigPath));
-			$defaultOptions = array_merge(self::$options, $defaultOptions);
+			self::$options  = array_merge(self::$options, $defaultOptions);
 		} catch (ParseException $e) {
 			Console::writeError("Config parse error in <path>".Console::getHumanReadablePath(self::$plConfigPath)."</path>: ".$e->getMessage());
 		}

Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ public static function init($baseDir = "", $verbose = true) {`
`155`	`155`	`// set the default config using the pattern lab config`
`156`	`156`	`try {`
`157`	`157`	`$defaultOptions = Yaml::parse(file_get_contents(self::$plConfigPath));`
`158`		`- $defaultOptions = array_merge(self::$options, $defaultOptions);`
	`158`	`+ self::$options = array_merge(self::$options, $defaultOptions);`
`159`	`159`	`} catch (ParseException $e) {`
`160`	`160`	`Console::writeError("Config parse error in <path>".Console::getHumanReadablePath(self::$plConfigPath)."</path>: ".$e->getMessage());`
`161`	`161`	`}`