X-Git-Url: https://git.cyclocoop.org/%242?a=blobdiff_plain;f=thumb.php;h=35ab9f27e622ba6499ae2dfc2ecd9d19ce96909f;hb=bbd3852aafb25dd99baf0731a9040b0ba1e69484;hp=4ffefb686c8ca4fc80cb8cf29cb11f4074491e24;hpb=c6601cfa0ce4101d4328f8c998e377453ba35044;p=lhc%2Fweb%2Fwiklou.git diff --git a/thumb.php b/thumb.php index 4ffefb686c..35ab9f27e6 100644 --- a/thumb.php +++ b/thumb.php @@ -107,6 +107,15 @@ function wfStreamThumb( array $params ) { $fileName = isset( $params['f'] ) ? $params['f'] : ''; + // Backwards compatibility parameters + if ( isset( $params['w'] ) ) { + $params['width'] = $params['w']; + unset( $params['w'] ); + } + if ( isset( $params['p'] ) ) { + $params['page'] = $params['p']; + } + // Is this a thumb of an archived file? $isOld = ( isset( $params['archived'] ) && $params['archived'] ); unset( $params['archived'] ); // handlers don't care @@ -235,14 +244,6 @@ function wfStreamThumb( array $params ) { } } - // Backwards compatibility parameters - if ( isset( $params['w'] ) ) { - $params['width'] = $params['w']; - unset( $params['w'] ); - } - if ( isset( $params['p'] ) ) { - $params['page'] = $params['p']; - } unset( $params['r'] ); // ignore 'r' because we unconditionally pass File::RENDER unset( $params['f'] ); // We're done with 'f' parameter. @@ -304,6 +305,12 @@ function wfStreamThumb( array $params ) { return; } + $user = RequestContext::getMain()->getUser(); + if ( $user->pingLimiter( 'renderfile' ) ) { + wfThumbError( 500, wfMessage( 'actionthrottledtext' ) ); + return; + } + // Thumbnail isn't already there, so create the new thumbnail... try { $thumb = $img->transform( $params, File::RENDER_NOW );