https://www.mediawiki.org/wiki/Special:Code/MediaWiki/112264
Revision: 112264
Author: aaron
Date: 2012-02-23 23:11:28 +0000 (Thu, 23 Feb 2012)
Log Message:
-----------
MFT r112260
Modified Paths:
--------------
branches/wmf/1.19wmf1/extensions/OggHandler/OggHandler_body.php
Property Changed:
----------------
branches/wmf/1.19wmf1/extensions/OggHandler/OggHandler_body.php
Modified: branches/wmf/1.19wmf1/extensions/OggHandler/OggHandler_body.php
===================================================================
--- branches/wmf/1.19wmf1/extensions/OggHandler/OggHandler_body.php
2012-02-23 23:10:44 UTC (rev 112263)
+++ branches/wmf/1.19wmf1/extensions/OggHandler/OggHandler_body.php
2012-02-23 23:11:28 UTC (rev 112264)
@@ -261,9 +261,9 @@
global $wgOggThumbLocation;
if ( $wgOggThumbLocation !== false ) {
- $status = $this->runOggThumb( $file->getPath(),
$dstPath, $thumbTime );
+ $status = $this->runOggThumb( $file->getLocalRefPath(),
$dstPath, $thumbTime );
} else {
- $status = $this->runFFmpeg( $file->getPath(), $dstPath,
$thumbTime );
+ $status = $this->runFFmpeg( $file->getLocalRefPath(),
$dstPath, $thumbTime );
}
if ( $status === true ) {
return new OggVideoDisplay( $file, $file->getURL(),
$dstUrl, $width, $height,
Property changes on:
branches/wmf/1.19wmf1/extensions/OggHandler/OggHandler_body.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/wmf/1.18wmf1/extensions/OggHandler/OggHandler_body.php:98207
/trunk/extensions/OggHandler/OggHandler_body.php:111199
+ /branches/wmf/1.18wmf1/extensions/OggHandler/OggHandler_body.php:98207
/trunk/extensions/OggHandler/OggHandler_body.php:111199,112260
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
