* Fixed a few basic PHP5 problems (aiming at PHP5 support in 3.7.0)
authorKasper Skårhøj <kasper@typo3.org>
Thu, 2 Sep 2004 11:36:04 +0000 (11:36 +0000)
committerKasper Skårhøj <kasper@typo3.org>
Thu, 2 Sep 2004 11:36:04 +0000 (11:36 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@451 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/mod/tools/em/index.php

index c2dab4a..18ed8d8 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2004-09-02  Kasper Skårhøj,,,  <kasper@typo3.com>
 
 2004-09-02  Kasper Skårhøj,,,  <kasper@typo3.com>
 
+       * Fixed a few basic PHP5 problems (aiming at PHP5 support in 3.7.0)
+
+2004-09-02  Kasper Skårhøj,,,  <kasper@typo3.com>
+
        * BTW; Just created a hook for page indexing which "indexed_search" will also be using in near future - BUT at the time of this writing it will require a new version of indexed_search for you and that is NOT ready yet - so indexed_search will NOT work for you anymore before you get the new version of this extension!
 
 2004-09-02  Kasper Skårhøj,,,  <kasper@typo3.com>
        * BTW; Just created a hook for page indexing which "indexed_search" will also be using in near future - BUT at the time of this writing it will require a new version of indexed_search for you and that is NOT ready yet - so indexed_search will NOT work for you anymore before you get the new version of this extension!
 
 2004-09-02  Kasper Skårhøj,,,  <kasper@typo3.com>
index d0d0065..f9931ad 100755 (executable)
@@ -413,7 +413,8 @@ class SC_mod_tools_em_index extends t3lib_SCbase {
         */
        function handleExternalFunctionValue($MM_key='function', $MS_value=NULL)        {
                $MS_value = is_null($MS_value) ? $this->MOD_SETTINGS[$MM_key] : $MS_value;
         */
        function handleExternalFunctionValue($MM_key='function', $MS_value=NULL)        {
                $MS_value = is_null($MS_value) ? $this->MOD_SETTINGS[$MM_key] : $MS_value;
-               $this->extClassConf = array_merge($this->getExternalItemConfig($this->MCONF['name'],$MM_key,$MS_value),$this->extClassConf);
+               $externalItems = $this->getExternalItemConfig($this->MCONF['name'],$MM_key,$MS_value);
+               if (is_array($externalItems))   $this->extClassConf = array_merge($externalItems,$this->extClassConf);
                if (is_array($this->extClassConf) && $this->extClassConf['path'])       {
                        $this->include_once[]=$this->extClassConf['path'];
                }
                if (is_array($this->extClassConf) && $this->extClassConf['path'])       {
                        $this->include_once[]=$this->extClassConf['path'];
                }
@@ -466,9 +467,9 @@ class SC_mod_tools_em_index extends t3lib_SCbase {
                        'fe_p' => '',
                        'fe_up' => '',
                );
                        'fe_p' => '',
                        'fe_up' => '',
                );
-               
+
                $this->MOD_MENU['singleDetails'] = $this->mergeExternalItems($this->MCONF['name'],'singleDetails',$this->MOD_MENU['singleDetails']);
                $this->MOD_MENU['singleDetails'] = $this->mergeExternalItems($this->MCONF['name'],'singleDetails',$this->MOD_MENU['singleDetails']);
-               
+
                        // page/be_user TSconfig settings and blinding of menu-items
                if (!$BE_USER->getTSConfigVal('mod.'.$this->MCONF['name'].'.allowTVlisting'))   {
                        unset($this->MOD_MENU['display_details'][3]);
                        // page/be_user TSconfig settings and blinding of menu-items
                if (!$BE_USER->getTSConfigVal('mod.'.$this->MCONF['name'].'.allowTVlisting'))   {
                        unset($this->MOD_MENU['display_details'][3]);
@@ -4335,7 +4336,7 @@ if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['typo3/mod/t
 $SOBE = t3lib_div::makeInstance('SC_mod_tools_em_index');
 $SOBE->init();
 foreach($SOBE->include_once as $INC_FILE) {
 $SOBE = t3lib_div::makeInstance('SC_mod_tools_em_index');
 $SOBE->init();
 foreach($SOBE->include_once as $INC_FILE) {
-    include_once($INC_FILE);    
+    include_once($INC_FILE);
 }
 $SOBE->checkExtObj();
 $SOBE->main();
 }
 $SOBE->checkExtObj();
 $SOBE->main();