mirror_php/patternlab-php
1
0
Fork 0
mirror of https://github.com/pattern-lab/patternlab-php.git synced 2025-01-17 22:29:12 +01:00
Code Issues Releases Wiki Activity

adding a check to make sure items are valid arrays

Browse Source
This commit is contained in:
Dave Olsen 2014-01-26 21:17:32 -05:00
parent fbf5c52367
commit c10b20e8d7
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/lib/PatternLab/Builder.php
View File

@ -716,7 +716,9 @@ class Builder {
$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);
}
}