* Fixed bug: htmlArea RTE calling t3lib_div::getUserObj() with an empty string

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

diff --git a/ChangeLog b/ChangeLog
index cc8da64..019b6ce 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-02-04  Stanislas Rolland  <stanislas.rolland@fructifor.ca>
+
+       * Fixed bug: htmlArea RTE calling t3lib_div::getUserObj() with an empty string
+
 2008-02-04  Benjamin Mack  <mack@xnos.org>
 
        * Fixed bug #7354: Filelist titles length was fixed to 30 characters, now uses value from user setup (Thanks to Stefano Cecere)

diff --git a/typo3/sysext/rtehtmlarea/ChangeLog b/typo3/sysext/rtehtmlarea/ChangeLog
index 36f2c59..c956274 100644 (file)
--- a/typo3/sysext/rtehtmlarea/ChangeLog
+++ b/typo3/sysext/rtehtmlarea/ChangeLog
@@ -1,3 +1,7 @@
+2008-02-04  Stanislas Rolland  <stanislas.rolland@fructifor.ca>
+
+       * Fixed bug: htmlArea RTE calling t3lib_div::getUserObj() with an empty string
+
 2008-02-01  Stanislas Rolland  <stanislas.rolland@fructifor.ca>
 
        * added feature #880: Click-enlarge for Images in htmlArea RTE

diff --git a/typo3/sysext/rtehtmlarea/class.tx_rtehtmlarea_base.php b/typo3/sysext/rtehtmlarea/class.tx_rtehtmlarea_base.php
index feb51f5..1849112 100644 (file)
--- a/typo3/sysext/rtehtmlarea/class.tx_rtehtmlarea_base.php
+++ b/typo3/sysext/rtehtmlarea/class.tx_rtehtmlarea_base.php
@@ -493,7 +493,10 @@ class tx_rtehtmlarea_base extends t3lib_rteapi {
                                        // Traverse registered plugins
                if (is_array($TYPO3_CONF_VARS['EXTCONF'][$this->ID]['plugins'])) {
                        foreach($TYPO3_CONF_VARS['EXTCONF'][$this->ID]['plugins'] as $pluginId => $pluginObjectConfiguration) {
-                               $plugin = &t3lib_div::getUserObj($pluginObjectConfiguration['objectReference']);
+                               $plugin = false;
+                               if (is_array($pluginObjectConfiguration) && count($pluginObjectConfiguration)) {
+                                       $plugin = &t3lib_div::getUserObj($pluginObjectConfiguration['objectReference']);
+                               }
                                if (is_object($plugin)) {
                                        if ($plugin->main($this)) {
                                                $this->registeredPlugins[$pluginId] = $plugin;