Index: typo3/sysext/cms/tslib/content/class.tslib_content_media.php
===================================================================
--- typo3/sysext/cms/tslib/content/class.tslib_content_media.php	(revision 10120)
+++ typo3/sysext/cms/tslib/content/class.tslib_content_media.php	(revision )
@@ -137,7 +137,7 @@
 		} 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 @@
 			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 @@
 
 		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);