* (feature) Added feature #6472: IRRE - Possibility to manipulate control items for each child records
* (minor) Fixed bug #7371: Query generator does not accept dates in where condition
* (tweak) Followup to #6087: Added missing labels localize.isLocalizable and localize.wasRemovedInOriginal
+ * (tweak) Followup to #7350: Fixed type to match with t3lib_div::array_merge_recursive_overrule()
2008-02-03 Dmitry Dulepov <dmitry@typo3.org>
# include($this->thisPath.'/'.$this->localLangFile);
if ($this->localLangFile && (@is_file($this->thisPath.'/'.$this->localLangFile) || @is_file($this->thisPath.'/'.substr($this->localLangFile,0,-4).'.xml'))) {
$LOCAL_LANG = $LANG->includeLLFile($this->thisPath.'/'.$this->localLangFile, FALSE);
- if (is_array($LOCAL_LANG)) $GLOBALS['LOCAL_LANG'] = t3lib_div::array_merge_recursive_overrule($GLOBALS['LOCAL_LANG'],$LOCAL_LANG);
+ if (is_array($LOCAL_LANG)) {
+ $GLOBALS['LOCAL_LANG'] = t3lib_div::array_merge_recursive_overrule((array)$GLOBALS['LOCAL_LANG'], $LOCAL_LANG);
+ }
}
}