Fixed bug #17371: Typo in MEDIA renders wrong height
authorSteffen Kamper <info@sk-typo3.de>
Tue, 1 Feb 2011 10:54:41 +0000 (10:54 +0000)
committerSteffen Kamper <info@sk-typo3.de>
Tue, 1 Feb 2011 10:54:41 +0000 (10:54 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@10355 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/sysext/cms/tslib/content/class.tslib_content_media.php

index 7666b01..c147ec1 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-02-01  Steffen Kamper  <steffen@typo3.org>
+
+       * Fixed bug #17371: Typo in MEDIA renders wrong height
+
 2011-01-31  Ernesto Baschny  <ernst@cron-it.de>
 
        * Fixed bug #17402: Error page should use TYPO3_copyright_year constant (Thanks to Johannes Feustel)
index cee9082..8bc40a1 100644 (file)
@@ -137,7 +137,7 @@ class tslib_content_Media extends tslib_content_Abstract {
                } else {
                        $height = isset($conf['height.'])
                                ? intval($this->cObj->stdWrap($conf['height'], $conf['height.']))
-                               : intval($conf['width']);
+                               : intval($conf['height']);
                        $conf['height'] = $height ? $height : $typeConf['defaultHeight'];
                }
 
@@ -191,7 +191,7 @@ class tslib_content_Media extends tslib_content_Abstract {
                        if ($url == '' && !$conf['allowEmptyUrl']) {
                                return '<p style="background-color: yellow;">' . $GLOBALS['TSFE']->sL('LLL:EXT:cms/locallang_ttc.xml:media.noFile', TRUE) . '</p>';
                        }
-                       $conf = array_merge($conf['mimeConf.']['swfobject.'], $conf);
+                       $conf = array_merge((array) $conf['mimeConf.']['swfobject.'], $conf);
                        $conf[$conf['type'] . '.']['player'] = strpos($url, '://') === FALSE ? 'http://' . $url : $url;
                        $conf['installUrl'] = 'null';
                        $conf['flashvars'] = array_merge((array) $conf['flashvars'], $conf['predefined']);
@@ -199,8 +199,8 @@ class tslib_content_Media extends tslib_content_Abstract {
 
                switch ($renderType) {
                        case 'swf' :
-                               $conf[$conf['type'] . '.'] = array_merge($conf['mimeConf.']['swfobject.'][$conf['type'] . '.'], $typeConf);
-                               $conf = array_merge($conf['mimeConf.']['swfobject.'], $conf);
+                               $conf[$conf['type'] . '.'] = array_merge((array) $conf['mimeConf.']['swfobject.'][$conf['type'] . '.'], $typeConf);
+                               $conf = array_merge((array) $conf['mimeConf.']['swfobject.'], $conf);
                                unset($conf['mimeConf.']);
                                $conf['flashvars.'] = array_merge((array) $conf['flashvars.'], $conf['predefined']);
                                $content = $this->cObj->SWFOBJECT($conf);