http://www.mediawiki.org/wiki/Special:Code/MediaWiki/84563
Revision: 84563
Author: dale
Date: 2011-03-22 21:39:33 +0000 (Tue, 22 Mar 2011)
Log Message:
-----------
use array_merge instead of array loop
moved class that configuration depends on above configuration
Modified Paths:
--------------
trunk/extensions/TimedMediaHandler/TimedMediaHandler.php
Modified: trunk/extensions/TimedMediaHandler/TimedMediaHandler.php
===================================================================
--- trunk/extensions/TimedMediaHandler/TimedMediaHandler.php 2011-03-22
21:32:56 UTC (rev 84562)
+++ trunk/extensions/TimedMediaHandler/TimedMediaHandler.php 2011-03-22
21:39:33 UTC (rev 84563)
@@ -10,6 +10,12 @@
exit( 1 );
}
+// Set up the timed media handler dir:
+$timedMediaDir = dirname(__FILE__);
+// Include WebVideoTranscode ( prior to config so that its defined transcode
keys can be used in configuration )
+$wgAutoloadClasses['WebVideoTranscode'] =
"$timedMediaDir/WebVideoTranscode/WebVideoTranscode.php";
+
+
/******************* CONFIGURATION STARTS HERE **********************/
/*** MwEmbed module configuration: *********************************/
@@ -74,18 +80,13 @@
);
/******************* CONFIGURATION ENDS HERE **********************/
-// Set up the timed media handler dir:
-$timedMediaDir = dirname(__FILE__);
-// List of extensions handled by Timed Media Handler since its refrenced in a
few places.
+
+// List of extensions handled by Timed Media Handler since its referenced in a
few places.
// you should not modify this variable
$tmhFileExtensions = array( 'ogg', 'ogv', 'oga', 'webm');
-foreach($tmhFileExtensions as $ext ){
- if ( !in_array( $ext, $wgFileExtensions ) ) {
- $wgFileExtensions[] = $ext;
- }
-}
+$wgFileExtensions = array_merge($wgFileExtensions, $tmhFileExtensions);
// Timed Media Handler AutoLoad Classes:
$wgAutoloadClasses['TimedMediaHandler'] =
"$timedMediaDir/TimedMediaHandler_body.php";
@@ -109,7 +110,6 @@
$wgAutoloadClasses['TextHandler'] =
"$timedMediaDir/handlers/TextHandler/TextHandler.php";
// Transcode support
-$wgAutoloadClasses['WebVideoTranscode'] =
"$timedMediaDir/WebVideoTranscode/WebVideoTranscode.php";
$wgAutoloadClasses['WebVideoTranscodeJob'] =
"$timedMediaDir/WebVideoTranscode/WebVideoTranscodeJob.php";
$wgAutoloadClasses['ApiQueryVideoInfo'] =
"$timedMediaDir/ApiQueryVideoInfo.php";
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
