r77455 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r77454‎ | r77455 | r77456 >
Date:04:47, 30 November 2010
Author:neilk
Status:ok
Tags:
Comment:
matching returns
Modified paths:
  • /trunk/phase3/includes/specials/SpecialUploadStash.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/specials/SpecialUploadStash.php
@@ -192,9 +192,8 @@
193193
194194 $scalerThumbName = $file->getParamThumbName( $file->name, $params );
195195 $scalerThumbUrl = $wgUploadStashScalerBaseUrl . '/' . $file->getRel() . '/' . $scalerThumbName;
196 - // make a CURL call to the scaler to create a thumbnail
197 - wfDebug( "UploadStash: calling " . $scalerThumbUrl . " with curl \n" );
198196
 197+ // make a curl call to the scaler to create a thumbnail
199198 $httpOptions = array(
200199 'method' => 'GET',
201200 'timeout' => 'default'
@@ -226,6 +225,7 @@
227226 }
228227 self::outputHeaders( $file->getMimeType(), $file->getSize() );
229228 readfile( $file->getPath() );
 229+ return true;
230230 }
231231
232232 /**
@@ -241,6 +241,7 @@
242242 }
243243 self::outputHeaders( $contentType, $size );
244244 print $content;
 245+ return true;
245246 }
246247
247248 /**

Follow-up revisions

RevisionCommit summaryAuthorDate
r77459Merging in changes from trunk into the UploadStash library and the SpecialUpl...neilk05:36, 30 November 2010
r774631.16wmf4: Merge UploadStash fixes from trunk: r77451, r77453, r77454, r77455,...catrope09:52, 30 November 2010

Status & tagging log