dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Chinese Conversion Table Update 2015-7"
[lhc/web/wiklou.git]
/
thumb.php
diff --git
a/thumb.php
b/thumb.php
index
25bca87
..
d39d43b
100644
(file)
--- a/
thumb.php
+++ b/
thumb.php
@@
-190,6
+190,7
@@
function wfStreamThumb( array $params ) {
if ( $targetFile->exists() ) {
$newThumbName = $targetFile->thumbName( $params );
if ( $isOld ) {
if ( $targetFile->exists() ) {
$newThumbName = $targetFile->thumbName( $params );
if ( $isOld ) {
+ /** @var array $bits */
$newThumbUrl = $targetFile->getArchiveThumbUrl(
$bits[0] . '!' . $targetFile->getName(), $newThumbName );
} else {
$newThumbUrl = $targetFile->getArchiveThumbUrl(
$bits[0] . '!' . $targetFile->getName(), $newThumbName );
} else {
@@
-221,7
+222,7
@@
function wfStreamThumb( array $params ) {
wfThumbErrorText( 404, "The source file '$fileName' does not exist." );
return;
} elseif ( $img->getPath() === false ) {
wfThumbErrorText( 404, "The source file '$fileName' does not exist." );
return;
} elseif ( $img->getPath() === false ) {
- wfThumbErrorText(
5
00, "The source file '$fileName' is not locally accessible." );
+ wfThumbErrorText(
4
00, "The source file '$fileName' is not locally accessible." );
return;
}
return;
}
@@
-316,22
+317,25
@@
function wfStreamThumb( array $params ) {
$user = RequestContext::getMain()->getUser();
if ( !wfThumbIsStandard( $img, $params ) && $user->pingLimiter( 'renderfile-nonstandard' ) ) {
$user = RequestContext::getMain()->getUser();
if ( !wfThumbIsStandard( $img, $params ) && $user->pingLimiter( 'renderfile-nonstandard' ) ) {
- wfThumbError(
500
, wfMessage( 'actionthrottledtext' )->parse() );
+ wfThumbError(
429
, wfMessage( 'actionthrottledtext' )->parse() );
return;
} elseif ( $user->pingLimiter( 'renderfile' ) ) {
return;
} elseif ( $user->pingLimiter( 'renderfile' ) ) {
- wfThumbError(
500
, wfMessage( 'actionthrottledtext' )->parse() );
+ wfThumbError(
429
, wfMessage( 'actionthrottledtext' )->parse() );
return;
}
list( $thumb, $errorMsg ) = wfGenerateThumbnail( $img, $params, $thumbName, $thumbPath );
return;
}
list( $thumb, $errorMsg ) = wfGenerateThumbnail( $img, $params, $thumbName, $thumbPath );
- /** @var MediaTransformOutput|bool $thumb */
+ /** @var MediaTransformOutput|
MediaTransformError|
bool $thumb */
// Check for thumbnail generation errors...
$msg = wfMessage( 'thumbnail_error' );
$errorCode = 500;
if ( !$thumb ) {
$errorMsg = $errorMsg ?: $msg->rawParams( 'File::transform() returned false' )->escaped();
// Check for thumbnail generation errors...
$msg = wfMessage( 'thumbnail_error' );
$errorCode = 500;
if ( !$thumb ) {
$errorMsg = $errorMsg ?: $msg->rawParams( 'File::transform() returned false' )->escaped();
+ if ( $errorMsg instanceof MessageSpecifier && $errorMsg->getKey() === 'thumbnail_image-failure-limit' ) {
+ $errorCode = 429;
+ }
} elseif ( $thumb->isError() ) {
$errorMsg = $thumb->getHtmlMsg();
} elseif ( !$thumb->hasFile() ) {
} elseif ( $thumb->isError() ) {
$errorMsg = $thumb->getHtmlMsg();
} elseif ( !$thumb->hasFile() ) {
@@
-412,7
+416,7
@@
function wfGenerateThumbnail( File $file, array $params, $thumbName, $thumbPath
'fallback' => function () {
return wfMessage( 'generic-pool-error' )->parse();
},
'fallback' => function () {
return wfMessage( 'generic-pool-error' )->parse();
},
- 'error' => function ( $status ) {
+ 'error' => function (
Status
$status ) {
return $status->getHTML();
}
)
return $status->getHTML();
}
)
@@
-427,6
+431,7
@@
function wfGenerateThumbnail( File $file, array $params, $thumbName, $thumbPath
// Tried to select a page on a non-paged file?
}
// Tried to select a page on a non-paged file?
}
+ /** @noinspection PhpUnusedLocalVariableInspection */
$done = true; // no PHP fatal occured
if ( !$thumb || $thumb->isError() ) {
$done = true; // no PHP fatal occured
if ( !$thumb || $thumb->isError() ) {
@@
-497,7
+502,7
@@
function wfExtractThumbRequestInfo( $thumbRel ) {
*/
function wfExtractThumbParams( $file, $params ) {
if ( !isset( $params['thumbName'] ) ) {
*/
function wfExtractThumbParams( $file, $params ) {
if ( !isset( $params['thumbName'] ) ) {
- throw new
MW
Exception( "No thumbnail name passed to wfExtractThumbParams" );
+ throw new
InvalidArgument
Exception( "No thumbnail name passed to wfExtractThumbParams" );
}
$thumbname = $params['thumbName'];
}
$thumbname = $params['thumbName'];
@@
-536,7
+541,7
@@
function wfExtractThumbParams( $file, $params ) {
// As a last ditch fallback, use the traditional common parameters
if ( preg_match( '!^(page(\d*)-)*(\d*)px-[^/]*$!', $thumbname, $matches ) ) {
// As a last ditch fallback, use the traditional common parameters
if ( preg_match( '!^(page(\d*)-)*(\d*)px-[^/]*$!', $thumbname, $matches ) ) {
- list( /* all */,
$pagefull
, $pagenum, $size ) = $matches;
+ list( /* all */,
/* pagefull */
, $pagenum, $size ) = $matches;
$params['width'] = $size;
if ( $pagenum ) {
$params['page'] = $pagenum;
$params['width'] = $size;
if ( $pagenum ) {
$params['page'] = $pagenum;
@@
-551,11
+556,11
@@
function wfExtractThumbParams( $file, $params ) {
* Output a thumbnail generation error message
*
* @param int $status
* Output a thumbnail generation error message
*
* @param int $status
- * @param string $msg Plain text (will be html escaped)
+ * @param string $msg
Text
Plain text (will be html escaped)
* @return void
*/
function wfThumbErrorText( $status, $msgText ) {
* @return void
*/
function wfThumbErrorText( $status, $msgText ) {
-
return
wfThumbError( $status, htmlspecialchars( $msgText ) );
+ wfThumbError( $status, htmlspecialchars( $msgText ) );
}
/**
}
/**
@@
-570,10
+575,8
@@
function wfThumbError( $status, $msgHtml ) {
header( 'Cache-Control: no-cache' );
header( 'Content-Type: text/html; charset=utf-8' );
header( 'Cache-Control: no-cache' );
header( 'Content-Type: text/html; charset=utf-8' );
- if ( $status == 400 ) {
- HttpStatus::header( 400 );
- } elseif ( $status == 404 ) {
- HttpStatus::header( 404 );
+ if ( $status == 400 || $status == 404 || $status == 429 ) {
+ HttpStatus::header( $status );
} elseif ( $status == 403 ) {
HttpStatus::header( 403 );
header( 'Vary: Cookie' );
} elseif ( $status == 403 ) {
HttpStatus::header( 403 );
header( 'Vary: Cookie' );