adding a check to make sure items are valid arrays

Author: dmolsen

core/lib/PatternLab/Builder.php

@@ -716,7 +716,9 @@ protected function gatherPatternInfo() {
 						$this->d["patternSpecific"][$patternPartial]["listItems"] = array();
 					}
 
-					$this->d["patternSpecific"][$patternPartial]["data"] = array_merge($patternDataBase, $patternData);
+					if (is_array($patternDataBase) && is_array($patternData)) {
+						$this->d["patternSpecific"][$patternPartial]["data"] = array_merge($patternDataBase, $patternData);
+					}
 
 				}