added normalization for parameter 'page', based on pageCount, as by tims comment...
authorDaniel Kinzler <daniel@users.mediawiki.org>
Tue, 29 Jun 2010 08:40:23 +0000 (08:40 +0000)
committerDaniel Kinzler <daniel@users.mediawiki.org>
Tue, 29 Jun 2010 08:40:23 +0000 (08:40 +0000)
includes/media/Generic.php

index 6f2230b..f53ad7b 100644 (file)
@@ -357,9 +357,19 @@ abstract class ImageHandler extends MediaHandler {
                if ( !isset( $params['width'] ) ) {
                        return false;
                }
+
                if ( !isset( $params['page'] ) ) {
                        $params['page'] = 1;
+               } else  {
+                       if ( $params['page'] > $image->pageCount() ) {
+                               $params['page'] = $image->pageCount();
+                       }
+
+                       if ( $params['page'] < 1 ) {
+                               $params['page'] = 1;
+                       }
                }
+
                $srcWidth = $image->getWidth( $params['page'] );
                $srcHeight = $image->getHeight( $params['page'] );
                if ( isset( $params['height'] ) && $params['height'] != -1 ) {