Follow-up on feature #9157: htmlArea RTE EM setting for DAM - correcting test on...

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

diff --git a/ChangeLog b/ChangeLog
index 3cfaa32..8dc8d30 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@
        * Follow-up for issue #8717: Add suggested doc extension to htmlArea RTE ext_emconf.php
        * Fixed bug #8996: htmlArea RTE: link to file not updated when changing case in file name
        * Added feature #9157: htmlArea RTE EM setting for DAM becomes deprecated with DAM 1.1+
+       * Follow-up on feature #9157: htmlArea RTE EM setting for DAM - correcting test on DAM version
 
 2008-08-11  Ingo Renner  <ingo@typo3.org>
 

diff --git a/typo3/sysext/rtehtmlarea/ChangeLog b/typo3/sysext/rtehtmlarea/ChangeLog
index b5280ba..2d4467d 100644 (file)
--- a/typo3/sysext/rtehtmlarea/ChangeLog
+++ b/typo3/sysext/rtehtmlarea/ChangeLog
@@ -4,6 +4,7 @@
        * Follow-up for issue #8717: Add suggested doc extension to htmlArea RTE ext_emconf.php
        * Fixed bug #8996: htmlArea RTE: link to file not updated when changing case in file name
        * Added feature #9157: htmlArea RTE EM setting for DAM becomes deprecated with DAM 1.1+
+       * Follow-up on feature #9157: htmlArea RTE EM setting for DAM - correcting test on DAM version
 
 2008-08-04  Stanislas Rolland  <typo3@sjbr.ca>
 

diff --git a/typo3/sysext/rtehtmlarea/ext_localconf.php b/typo3/sysext/rtehtmlarea/ext_localconf.php
index bea7ce7..c16a0f2 100644 (file)
--- a/typo3/sysext/rtehtmlarea/ext_localconf.php
+++ b/typo3/sysext/rtehtmlarea/ext_localconf.php
@@ -189,8 +189,11 @@ $TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['enableInOpera9'] = $_EXTCONF['enableInOpe
        // If DAM 1.1+ is installed, the setting must be unset, DAM own EM setting should be used
 $TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['enableDAMBrowser'] = 0;
 if (t3lib_extMgm::isLoaded('dam')) {
-       require_once(t3lib_extMgm::extPath('dam') . 'ext_emconf.php');
-       if (t3lib_div::int_from_ver($EM_CONF[$_EXTKEY]['version']) <= 1000999) {
+       $saveExtKey = $_EXTKEY;
+       $_EXTKEY = 'dam';
+       require(t3lib_extMgm::extPath('dam') . 'ext_emconf.php');
+       $_EXTKEY = $saveExtKey;
+       if (t3lib_div::int_from_ver($EM_CONF['dam']['version']) < 1001000) {
                $TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['enableDAMBrowser'] = $_EXTCONF['enableDAMBrowser'] ? $_EXTCONF['enableDAMBrowser'] : 0;
        }
 }