making sure documentation-surfaced content overwrites pattern-surfaced content

dmolsen · dmolsen · commit 7ed9aa176a9a · 2016-06-29T14:37:24.000-04:00
diff --git a/src/PatternLab/PatternData/Rules/PatternRule.php b/src/PatternLab/PatternData/Rules/PatternRule.php
@@ -101,7 +101,7 @@ public function run($depth, $ext, $path, $pathName, $name) {
 		}
 		
 		// if the pattern data store already exists make sure it is merged and overwrites this data
-		$patternStoreData = (PatternData::checkOption($patternStoreKey)) ? array_replace_recursive(PatternData::getOption($patternStoreKey),$patternStoreData) : $patternStoreData;
+		$patternStoreData = (PatternData::checkOption($patternStoreKey)) ? array_replace_recursive($patternStoreData, PatternData::getOption($patternStoreKey)) : $patternStoreData;
 		PatternData::setOption($patternStoreKey, $patternStoreData);
 		
 	}

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ public function run($depth, $ext, $path, $pathName, $name) {`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`// if the pattern data store already exists make sure it is merged and overwrites this data`
`104`		`- $patternStoreData = (PatternData::checkOption($patternStoreKey)) ? array_replace_recursive(PatternData::getOption($patternStoreKey),$patternStoreData) : $patternStoreData;`
	`104`	`+ $patternStoreData = (PatternData::checkOption($patternStoreKey)) ? array_replace_recursive($patternStoreData, PatternData::getOption($patternStoreKey)) : $patternStoreData;`
`105`	`105`	`PatternData::setOption($patternStoreKey, $patternStoreData);`
`106`	`106`
`107`	`107`	`}`