Followup to #7350: Fixed type to match with t3lib_div::array_merge_recursive_overrule()

git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@3063 709f56b5-9817-0410-a4d7-c38de5d9e867

diff --git a/ChangeLog b/ChangeLog
index 224de2b..77fe839 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,6 +24,7 @@
        * (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>
 

diff --git a/t3lib/class.t3lib_extobjbase.php b/t3lib/class.t3lib_extobjbase.php
index 1121960..c18861d 100755 (executable)
--- a/t3lib/class.t3lib_extobjbase.php
+++ b/t3lib/class.t3lib_extobjbase.php
@@ -242,7 +242,9 @@ class t3lib_extobjbase {
                #       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);
+                       }
                }
        }