http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89442
Revision: 89442
Author: brion
Date: 2011-06-03 20:43:05 +0000 (Fri, 03 Jun 2011)
Log Message:
-----------
Fix fatal error in TimedMediaHandler when a file page is deleted and there's no
matching file (anymore). Found while running phpunit tests.
I.I......................E................................... 1342 / 2357 ( 56%)
............................................................. 1403 / 2357 ( 59%)
............................................................. 1464 / 2357 ( 62%)
...S...IIIIIIIIIIIII...IIIIIIIIIIIIIII....................... 1525 / 2357 ( 64%)
.......................................FFPHP Fatal error: Call to a member
function getHandler() on a non-object in
/var/www/trunk/extensions/TimedMediaHandler/TimedMediaHandler.hooks.php on line
131
make: *** [safe] Error 255
Modified Paths:
--------------
trunk/extensions/TimedMediaHandler/TimedMediaHandler.hooks.php
Modified: trunk/extensions/TimedMediaHandler/TimedMediaHandler.hooks.php
===================================================================
--- trunk/extensions/TimedMediaHandler/TimedMediaHandler.hooks.php
2011-06-03 20:39:02 UTC (rev 89441)
+++ trunk/extensions/TimedMediaHandler/TimedMediaHandler.hooks.php
2011-06-03 20:43:05 UTC (rev 89442)
@@ -128,10 +128,12 @@
if( $article->getTitle()->getNamespace() == NS_FILE ) {
$file = wfFindFile( $article->getTitle() );
- $mediaType = $file->getHandler()->getMetadataType(
$image = '' );
-
- if( $mediaType == 'webm' || $mediaType == 'ogg' ){
- WebVideoTranscode::removeTranscodeJobs( $file
);
+ if ( $file ) {
+ $mediaType =
$file->getHandler()->getMetadataType( $image = '' );
+
+ if( $mediaType == 'webm' || $mediaType == 'ogg'
){
+ WebVideoTranscode::removeTranscodeJobs(
$file );
+ }
}
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
