http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89897
Revision: 89897
Author: dale
Date: 2011-06-11 21:47:06 +0000 (Sat, 11 Jun 2011)
Log Message:
-----------
renamed $tmhFileExtensions global to include standard $wg prefix :
$wgTmhFileExtensions
Modified Paths:
--------------
trunk/extensions/TimedMediaHandler/TimedMediaHandler.hooks.php
trunk/extensions/TimedMediaHandler/TimedMediaHandler.php
Modified: trunk/extensions/TimedMediaHandler/TimedMediaHandler.hooks.php
===================================================================
--- trunk/extensions/TimedMediaHandler/TimedMediaHandler.hooks.php
2011-06-11 21:40:11 UTC (rev 89896)
+++ trunk/extensions/TimedMediaHandler/TimedMediaHandler.hooks.php
2011-06-11 21:47:06 UTC (rev 89897)
@@ -12,7 +12,7 @@
static function register(){
global $wgParserOutputHooks, $wgHooks, $wgJobClasses,
$wgJobTypesExcludedFromDefaultQueue,
$wgMediaHandlers, $wgResourceModules,
$wgExcludeFromThumbnailPurge, $wgExtraNamespaces,
- $tmhFileExtensions, $wgParserOutputHooks, $wgOut,
$wgAPIPropModules, $wgTimedTextNS;
+ $wgTmhFileExtensions, $wgParserOutputHooks, $wgOut,
$wgAPIPropModules, $wgTimedTextNS;
// Register the Timed Media Handler javascript resources (
MwEmbed modules )
MwEmbedResourceManager::register(
'extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer' );
@@ -66,7 +66,7 @@
// Exclude transcoded assets from normal thumbnail purging
// ( a maintenance script could handle transcode asset purging)
- $wgExcludeFromThumbnailPurge = array_merge(
$wgExcludeFromThumbnailPurge, $tmhFileExtensions );
+ $wgExcludeFromThumbnailPurge = array_merge(
$wgExcludeFromThumbnailPurge, $wgTmhFileExtensions );
// Also add the .log file ( used in two pass encoding )
// ( probably should move in-progress encodes out of web
accessible directory )
Modified: trunk/extensions/TimedMediaHandler/TimedMediaHandler.php
===================================================================
--- trunk/extensions/TimedMediaHandler/TimedMediaHandler.php 2011-06-11
21:40:11 UTC (rev 89896)
+++ trunk/extensions/TimedMediaHandler/TimedMediaHandler.php 2011-06-11
21:47:06 UTC (rev 89897)
@@ -97,9 +97,9 @@
// 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');
+$wgTmhFileExtensions = array( 'ogg', 'ogv', 'oga', 'webm');
-$wgFileExtensions = array_merge($wgFileExtensions, $tmhFileExtensions);
+$wgFileExtensions = array_merge( $wgFileExtensions, $wgTmhFileExtensions );
// Timed Media Handler AutoLoad Classes:
$wgAutoloadClasses['TimedMediaHandler'] =
"$timedMediaDir/TimedMediaHandler_body.php";
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
