http://www.mediawiki.org/wiki/Special:Code/MediaWiki/91945
Revision: 91945
Author: questpc
Date: 2011-07-12 10:50:02 +0000 (Tue, 12 Jul 2011)
Log Message:
-----------
Small patch to make current Extension:TimedMediaHandler compatible to MediaWiki
1.17.
Modified Paths:
--------------
trunk/extensions/TimedMediaHandler/TimedMediaHandler.hooks.php
trunk/extensions/TimedMediaHandler/TranscodeStatusTable.php
Modified: trunk/extensions/TimedMediaHandler/TimedMediaHandler.hooks.php
===================================================================
--- trunk/extensions/TimedMediaHandler/TimedMediaHandler.hooks.php
2011-07-12 10:19:08 UTC (rev 91944)
+++ trunk/extensions/TimedMediaHandler/TimedMediaHandler.hooks.php
2011-07-12 10:50:02 UTC (rev 91945)
@@ -84,7 +84,9 @@
// Exclude transcoded assets from normal thumbnail purging
// ( a maintenance script could handle transcode asset purging)
- $wgExcludeFromThumbnailPurge = array_merge(
$wgExcludeFromThumbnailPurge, $wgTmhFileExtensions );
+ if ( isset( $wgExcludeFromThumbnailPurge ) ) {
+ $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 )
@@ -109,6 +111,9 @@
// Add transcode status to video asset pages:
$wgHooks[ 'ImagePageAfterImageLinks' ][] =
'TimedMediaHandlerHooks::checkForTranscodeStatus';
+
+ // for MediaWiki 1.17 compatibility
+ TranscodeStatusTable::getLinker();
return true;
}
Modified: trunk/extensions/TimedMediaHandler/TranscodeStatusTable.php
===================================================================
--- trunk/extensions/TimedMediaHandler/TranscodeStatusTable.php 2011-07-12
10:19:08 UTC (rev 91944)
+++ trunk/extensions/TimedMediaHandler/TranscodeStatusTable.php 2011-07-12
10:50:02 UTC (rev 91945)
@@ -7,7 +7,15 @@
*
*/
class TranscodeStatusTable {
-
+
+ public static $linker;
+
+ public static function getLinker() {
+ if ( is_null( self::$linker ) ) {
+ self::$linker = new Linker();
+ }
+ }
+
public static function getHTML( $file ){
global $wgUser, $wgOut;
@@ -16,7 +24,7 @@
$o = '<h2>' . wfMsgHtml( 'timedmedia-status-header' ) . '</h2>';
// Give the user a purge page link
- $o.= Linker::link( $file->getTitle(),
wfMsg('timedmedia-update-status'), array(), array( 'action'=> 'purge' ) );
+ $o.= self::$linker->link( $file->getTitle(),
wfMsg('timedmedia-update-status'), array(), array( 'action'=> 'purge' ) );
$o.= Xml::openElement( 'table', array( 'class' => 'wikitable
transcodestatus' ) ) . "\n"
. '<tr>'
@@ -82,7 +90,7 @@
// Check for error:
if( !is_null( $state['time_error'] ) ){
if( !is_null( $state['error'] ) ){
- $showErrorLink = Linker::link(
$file->getTitle(), wfMsg('timedmedia-show-error'), array(
+ $showErrorLink = self::$linker->link(
$file->getTitle(), wfMsg('timedmedia-show-error'), array(
'title' =>
wfMsgHtml('timedmedia-error-on', $state['time_error'] ),
'class' => 'errorlink',
'data-error' => $state['error']
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
