http://www.mediawiki.org/wiki/Special:Code/MediaWiki/96554
Revision: 96554
Author: reedy
Date: 2011-09-08 11:21:14 +0000 (Thu, 08 Sep 2011)
Log Message:
-----------
MFT r93687
Modified Paths:
--------------
branches/REL1_18/phase3/includes/specials/SpecialUploadStash.php
Property Changed:
----------------
branches/REL1_18/phase3/includes/specials/SpecialUploadStash.php
Modified: branches/REL1_18/phase3/includes/specials/SpecialUploadStash.php
===================================================================
--- branches/REL1_18/phase3/includes/specials/SpecialUploadStash.php
2011-09-08 11:08:35 UTC (rev 96553)
+++ branches/REL1_18/phase3/includes/specials/SpecialUploadStash.php
2011-09-08 11:21:14 UTC (rev 96554)
@@ -226,8 +226,10 @@
$req = MWHttpRequest::factory( $scalerThumbUrl, $httpOptions );
$status = $req->execute();
if ( ! $status->isOK() ) {
- $errors = $status->getWikiTextArray(
$status->getErrorsArray() );
- throw new MWException( "Fetching thumbnail failed: " .
print_r( $errors, 1 ) );
+ $errors = $status->getErrorsArray();
+ $errorStr = "Fetching thumbnail failed: " . print_r(
$errors, 1 );
+ $errorStr .= "\nurl = $scalerThumbUrl\n";
+ throw new MWException( $errorStr );
}
$contentType = $req->getResponseHeader( "content-type" );
if ( ! $contentType ) {
Property changes on:
branches/REL1_18/phase3/includes/specials/SpecialUploadStash.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/specials/SpecialUploadStash.php:51646
/branches/sqlite/includes/specials/SpecialUploadStash.php:58211-58321
/branches/wmf-deployment/includes/specials/SpecialUploadStash.php:53381,56967
/trunk/phase3/includes/specials/SpecialUploadStash.php:73549-75058,75060-75587,75589-75821,92580,92713,92765,92884,92886-92887,92894,92898,92907,92932,93149,93151,93233-93234,93258,93266,93516-93518,93818-93822,93847,93858,93891,93935-93936,94068,94155,94235,94346,94372,94422,94425,94444,94448,94456,94498,94601,94728,94825,94862,94995-94997
+ /branches/REL1_15/phase3/includes/specials/SpecialUploadStash.php:51646
/branches/sqlite/includes/specials/SpecialUploadStash.php:58211-58321
/branches/wmf-deployment/includes/specials/SpecialUploadStash.php:53381,56967
/trunk/phase3/includes/specials/SpecialUploadStash.php:73549-75058,75060-75587,75589-75821,92580,92713,92765,92884,92886-92887,92894,92898,92907,92932,93149,93151,93233-93234,93258,93266,93516-93518,93687,93818-93822,93847,93858,93891,93935-93936,94068,94155,94235,94346,94372,94422,94425,94444,94448,94456,94498,94601,94728,94825,94862,94995-94997
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
