Fixed bug: PHP 5.3 throws a warning in class.t3lib_befunc.php on line 3348: trim...

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

diff --git a/ChangeLog b/ChangeLog
index fc81ec8..85629c5 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-08-06  Ingo Renner  <ingo@typo3.org>
+
+       * Fixed bug: PHP 5.3 throws a warning in class.t3lib_befunc.php on line 3348: trim() expects parameter 1 to be string, array given
+
 2008-08-05  Dmitry Dulepov  <dmitry@typo3.org>
 
        * Fixed bug #8890: Feature: hook in function "getSingleField_SW" before rendering of single fields in tceforms (thanks to Alex Widschwendter)

diff --git a/t3lib/class.t3lib_befunc.php b/t3lib/class.t3lib_befunc.php
index 26b4c2f..0ebb51e 100755 (executable)
--- a/t3lib/class.t3lib_befunc.php
+++ b/t3lib/class.t3lib_befunc.php
@@ -3337,9 +3337,10 @@ final class t3lib_BEfunc {
        public static function isModuleSetInTBE_MODULES($modName) {
                reset($GLOBALS['TBE_MODULES']);
                $loaded = array();
+
                while(list($mkey, $list) = each($GLOBALS['TBE_MODULES'])) {
                        $loaded[$mkey] = 1;
-                       if (trim($list)) {
+                       if (!is_array($list) && trim($list)) {
                                $subList = t3lib_div::trimExplode(',', $list, 1);
                                while(list(,$skey) = each($subList)) {
                                        $loaded[$mkey.'_'.$skey] = 1;