[TASK] Duplicate mime type declaration FlowPlayerContentObject 58/41658/4
authorSebastian Michaelsen <sebastian@michaelsen.io>
Sat, 18 Jul 2015 09:27:40 +0000 (11:27 +0200)
committerAnja Leichsenring <aleichsenring@ab-softlab.de>
Sat, 18 Jul 2015 10:11:39 +0000 (12:11 +0200)
* Fix duplicate array key in $mimeTypes for 'swa'
* Order the keys alphabetically, which can help to avoid duplicate keys

Resolves: #68332
Releases: master
Change-Id: Id242a9709c0bfb4ae1885b72eeeef419b35713ab
Reviewed-on: http://review.typo3.org/41658
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
typo3/sysext/mediace/Classes/ContentObject/FlowPlayerContentObject.php

index 71fa5e7..bf05528 100644 (file)
@@ -34,12 +34,12 @@ class FlowPlayerContentObject extends \TYPO3\CMS\Frontend\ContentObject\Abstract
                'au' => array(
                        'audio' => 'audio/x-au'
                ),
-               'avi' => array(
-                       'audio' => 'video/x-msvideo'
-               ),
                'asf' => array(
                        'video' => 'video/x-ms-asf'
                ),
+               'avi' => array(
+                       'audio' => 'video/x-msvideo'
+               ),
                'class' => array(
                        'audio' => 'application/java',
                        'video' => 'application/java'
@@ -53,6 +53,15 @@ class FlowPlayerContentObject extends \TYPO3\CMS\Frontend\ContentObject\Abstract
                'flv' => array(
                        'video' => 'video/x-flv'
                ),
+               'm4a' => array(
+                       'audio' => 'audio/mp4a-latm'
+               ),
+               'm4v' => array(
+                       'video' => 'video/x-m4v'
+               ),
+               'mov' => array(
+                       'video' => 'video/quicktime'
+               ),
                'mp3' => array(
                        'audio' => 'audio/mpeg'
                ),
@@ -69,18 +78,6 @@ class FlowPlayerContentObject extends \TYPO3\CMS\Frontend\ContentObject\Abstract
                'ogv' => array(
                        'video' => 'video/ogg'
                ),
-               'swa' => array(
-                       'audio' => 'audio/x-m4a'
-               ),
-               'mov' => array(
-                       'video' => 'video/quicktime'
-               ),
-               'm4a' => array(
-                       'audio' => 'audio/mp4a-latm'
-               ),
-               'm4v' => array(
-                       'video' => 'video/x-m4v'
-               ),
                'qt' => array(
                        'video' => 'video/quicktime'
                ),
@@ -222,7 +219,7 @@ class FlowPlayerContentObject extends \TYPO3\CMS\Frontend\ContentObject\Abstract
                $typeConf = $conf[$type . '.'];
                // Add Flowplayer js-file
                $this->getPageRenderer()->addJsFile($this->getPathToLibrary('flowplayer/flowplayer-3.2.13.min.js'));
-               // Add Flowpayer css for exprss install
+               // Add Flowpayer css for express install
                $this->getPageRenderer()->addCssFile($this->getPathToLibrary('flowplayer/express-install/express-install.css'));
                // Add videoJS js-file
                $this->getPageRenderer()->addJsFile($this->getPathToLibrary('videojs/video-js/video.js'));