Fixed bug #16825: Fatal error in lang.php (thanks to Georg Ringer)
authorJigal van Hemert <jigal@xs4all.nl>
Thu, 23 Dec 2010 11:42:13 +0000 (11:42 +0000)
committerJigal van Hemert <jigal@xs4all.nl>
Thu, 23 Dec 2010 11:42:13 +0000 (11:42 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/branches/TYPO3_4-3@9886 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/sysext/lang/lang.php

index e009b6c..9eac83b 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-12-23  Jigal van Hemert <jigal@xs4all.nl>
+
+       * Fixed bug #16825: Fatal error in lang.php (thanks to Georg Ringer)
+
 2010-12-21  Stanislas Rolland  <typo3@sjbr.ca>
 
        * Fixed bug #16760: RTE transformation removes all span tags on save after upgrade TYPO3 4.3.9
index 890ddad..b593aa3 100755 (executable)
@@ -403,7 +403,7 @@ class language {
                        // Get default file:
                $llang = $this->readLLfile($fileRef);
 
-               if (count($llang))      {
+               if (is_array($llang) && count($llang)) {
 
                        $LOCAL_LANG = t3lib_div::array_merge_recursive_overrule((array)$LOCAL_LANG,$llang);