http://www.mediawiki.org/wiki/Special:Code/MediaWiki/90620
Revision: 90620
Author: dale
Date: 2011-06-22 22:32:15 +0000 (Wed, 22 Jun 2011)
Log Message:
-----------
fixes history view of old sources by not looking for transcodes for old
versions of the file ( we only do transcodes for the current version of the
file )
Modified Paths:
--------------
trunk/extensions/TimedMediaHandler/TimedMediaTransformOutput.php
trunk/extensions/TimedMediaHandler/WebVideoTranscode/WebVideoTranscode.php
Modified: trunk/extensions/TimedMediaHandler/TimedMediaTransformOutput.php
===================================================================
--- trunk/extensions/TimedMediaHandler/TimedMediaTransformOutput.php
2011-06-22 22:24:49 UTC (rev 90619)
+++ trunk/extensions/TimedMediaHandler/TimedMediaTransformOutput.php
2011-06-22 22:32:15 UTC (rev 90620)
@@ -197,8 +197,8 @@
// The poster url:
$posterUrl = $this->getUrl();
- // Update the $posterUrl to $sizeOverride
- if( $sizeOverride && $sizeOverride[0] && intval(
$sizeOverride[0] ) != intval( $this->width ) ){
+ // Update the $posterUrl to $sizeOverride ( if not an old file
)
+ if( !$this->file->isOld() && $sizeOverride && $sizeOverride[0]
&& intval( $sizeOverride[0] ) != intval( $this->width ) ){
$apiUrl = $this->getPosterFromApi( $sizeOverride[0] );
if( $apiUrl ){
$posterUrl = $apiUrl;
Modified:
trunk/extensions/TimedMediaHandler/WebVideoTranscode/WebVideoTranscode.php
===================================================================
--- trunk/extensions/TimedMediaHandler/WebVideoTranscode/WebVideoTranscode.php
2011-06-22 22:24:49 UTC (rev 90619)
+++ trunk/extensions/TimedMediaHandler/WebVideoTranscode/WebVideoTranscode.php
2011-06-22 22:32:15 UTC (rev 90620)
@@ -286,6 +286,11 @@
return $sources;
}
+ // If an "oldFile" don't look for other sources:
+ if( $file->isOld() ){
+ return $sources;
+ }
+
// Just directly return audio sources ( No transcoding for
audio for now )
if( $file->getHandler()->isAudio( $file ) ){
return $sources;
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
