Merge "Add support for image interlacing of Bitmap type images"

[lhc/web/wiklou.git] / includes / gallery / ImageGalleryBase.php

diff --git a/includes/gallery/ImageGalleryBase.php b/includes/gallery/ImageGalleryBase.php
index c89c6b6..f26d688 100644 (file)
--- a/includes/gallery/ImageGalleryBase.php
+++ b/includes/gallery/ImageGalleryBase.php
@@ -91,14 +91,15 @@ abstract class ImageGalleryBase extends ContextSource {
                        $context = RequestContext::getMainAndWarn( __METHOD__ );
                }
                if ( !$mode ) {
-                       $galleryOpions = $context->getConfig()->get( 'GalleryOptions' );
-                       $mode = $galleryOpions['mode'];
+                       $galleryOptions = $context->getConfig()->get( 'GalleryOptions' );
+                       $mode = $galleryOptions['mode'];
                }
 
                $mode = $wgContLang->lc( $mode );
 
                if ( isset( self::$modeMapping[$mode] ) ) {
-                       return new self::$modeMapping[$mode]( $mode, $context );
+                       $class = self::$modeMapping[$mode];
+                       return new $class( $mode, $context );
                } else {
                        throw new MWException( "No gallery class registered for mode $mode" );
                }