Fixed bug #13991: Content Element Media does not work with render type "HTML Embed...

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

diff --git a/ChangeLog b/ChangeLog
index 33bc7bc..6436ef4 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-19  Steffen Kamper  <info@sk-typo3.de>
+
+       * Fixed bug #13991: Content Element Media does not work with render type "HTML Embed Element" (thanks to Sascha Egerer)
+
 2010-04-19  Patrick Broens  <patrick@patrickbroens.nl>
 
        * Fixed bug #14105: Install Tool: PHP Warning: implode() Invalid arguments passed in typo3\sysext\install\mod\class.tx_install.php line 8244

diff --git a/typo3/sysext/cms/tslib/class.tslib_content.php b/typo3/sysext/cms/tslib/class.tslib_content.php
index dae41aa..c114569 100644 (file)
--- a/typo3/sysext/cms/tslib/class.tslib_content.php
+++ b/typo3/sysext/cms/tslib/class.tslib_content.php
@@ -2789,7 +2789,7 @@ class tslib_cObj {
                                $conf['params.'] = array_merge((array) $conf['params.'], $conf['predefined']);
                                $content = $this->QTOBJECT($conf);
                        break;
-                       case 'media':
+                       case 'embed':
                                $paramsArray = array_merge((array) $typeConf['default.']['params.'], (array) $conf['params.'], $conf['predefined']);
                                $conf['params']= '';
                                foreach ($paramsArray as $key => $value) {