r98208 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r98207‎ | r98208 | r98209 >
Date:04:19, 27 September 2011
Author:tstarling
Status:ok (Comments)
Tags:
Comment:
Fix for r87923, which made broken but harmless code from r62223 actually start running and causing harm. $image is undefined and $length was unused. Merged from 1.18wmf1 r98207. This version does basically the same thing as the one in r25467, except that width and height parameters have been added.
Modified paths:
  • /trunk/extensions/OggHandler/OggHandler_body.php (modified) (history)

Diff [purge]

Index: trunk/extensions/OggHandler/OggHandler_body.php
@@ -26,7 +26,6 @@
2727 return true;
2828 }
2929 if ( $name == 'thumbtime' ) {
30 - $length = $this->getLength( $image );
3130 $time = $this->parseTimeString( $value );
3231 if ( $time === false || $time <= 0 ) {
3332 return false;
Property changes on: trunk/extensions/OggHandler/OggHandler_body.php
___________________________________________________________________
Added: svn:mergeinfo
3433 Merged /branches/wmf/1.18wmf1/extensions/OggHandler/OggHandler_body.php:r98207

Follow-up revisions

RevisionCommit summaryAuthorDate
r98766REL1_18 MFT r98110, r98208, r98278, r98301reedy14:18, 3 October 2011

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r25467* Implemented thumbtime and noplayer parameters as planned....tstarling04:05, 4 September 2007
r62223* In preparation for deployment, revert the bulk of Michael's unreviewed work...tstarling05:51, 10 February 2010
r87923Add support for the Height parameter for OggHandler. Fixes bug 28886...hartman19:41, 12 May 2011
r98207Fix for fatal error due to non-existent variable $imagetstarling02:05, 27 September 2011

Comments

#Comment by Vigilius (talk | contribs)   08:34, 27 September 2011

Please consider tagging for 1.18 as well, it has been added to 1.18wmf1 in r98207

Status & tagging log