X-Git-Url: http://git.cyclocoop.org/%28?a=blobdiff_plain;f=thumb.php;h=28f22fd4833094ae47df9c8b6c9cd1b4db11d6cd;hb=8ad81cbb7538d837c0e2b5ce337b71f2d07f02a8;hp=ebcf79f7432cd3278865bd2548790f36c374d797;hpb=5cea189b1b881d44413152349ec27425f10bdb3f;p=lhc%2Fweb%2Fwiklou.git diff --git a/thumb.php b/thumb.php index ebcf79f743..28f22fd483 100644 --- a/thumb.php +++ b/thumb.php @@ -426,66 +426,6 @@ function wfGenerateThumbnail( File $file, array $params, $thumbName, $thumbPath return array( $thumb, $errorHtml ); } -/** - * Returns true if this thumbnail is one that MediaWiki generates - * links to on file description pages and possibly parser output. - * - * $params is considered non-standard if they involve a non-standard - * width or any non-default parameters aside from width and page number. - * The number of possible files with standard parameters is far less than - * that of all combinations; rate-limiting for them can thus be more generious. - * - * @param File $file - * @param array $params - * @return bool - */ -function wfThumbIsStandard( File $file, array $params ) { - global $wgThumbLimits, $wgImageLimits; - - $handler = $file->getHandler(); - if ( !$handler || !isset( $params['width'] ) ) { - return false; - } - - $basicParams = array(); - if ( isset( $params['page'] ) ) { - $basicParams['page'] = $params['page']; - } - - // Check if the width matches one of $wgThumbLimits - if ( in_array( $params['width'], $wgThumbLimits ) ) { - $normalParams = $basicParams + array( 'width' => $params['width'] ); - // Append any default values to the map (e.g. "lossy", "lossless", ...) - $handler->normaliseParams( $file, $normalParams ); - } else { - // If not, then check if the width matchs one of $wgImageLimits - $match = false; - foreach ( $wgImageLimits as $pair ) { - $normalParams = $basicParams + array( 'width' => $pair[0], 'height' => $pair[1] ); - // Decide whether the thumbnail should be scaled on width or height. - // Also append any default values to the map (e.g. "lossy", "lossless", ...) - $handler->normaliseParams( $file, $normalParams ); - // Check if this standard thumbnail size maps to the given width - if ( $normalParams['width'] == $params['width'] ) { - $match = true; - break; - } - } - if ( !$match ) { - return false; // not standard for description pages - } - } - - // Check that the given values for non-page, non-width, params are just defaults - foreach ( $params as $key => $value ) { - if ( !isset( $normalParams[$key] ) || $normalParams[$key] != $value ) { - return false; - } - } - - return true; -} - /** * Convert pathinfo type parameter, into normal request parameters * @@ -626,7 +566,11 @@ function wfThumbError( $status, $msg ) { $debug = ''; } echo <<Error generating thumbnail + + + +Error generating thumbnail +

Error generating thumbnail