diff options
| author | Pierre Schmitz <pierre@archlinux.de> | 2015-12-17 09:15:42 +0100 |
|---|---|---|
| committer | Pierre Schmitz <pierre@archlinux.de> | 2015-12-17 09:44:51 +0100 |
| commit | a1789ddde42033f1b05cc4929491214ee6e79383 (patch) | |
| tree | 63615735c4ddffaaabf2428946bb26f90899f7bf /includes/gallery | |
| parent | 9e06a62f265e3a2aaabecc598d4bc617e06fa32d (diff) | |
Update to MediaWiki 1.26.0
Diffstat (limited to 'includes/gallery')
| -rw-r--r-- | includes/gallery/PackedImageGallery.php | 4 | ||||
| -rw-r--r-- | includes/gallery/PackedOverlayImageGallery.php | 2 | ||||
| -rw-r--r-- | includes/gallery/TraditionalImageGallery.php | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/includes/gallery/PackedImageGallery.php b/includes/gallery/PackedImageGallery.php index 52a49ddb..821c85fb 100644 --- a/includes/gallery/PackedImageGallery.php +++ b/includes/gallery/PackedImageGallery.php @@ -21,8 +21,8 @@ */ class PackedImageGallery extends TraditionalImageGallery { - function __construct( $mode = 'traditional' ) { - parent::__construct( $mode ); + function __construct( $mode = 'traditional', IContextSource $context = null ) { + parent::__construct( $mode, $context ); // Does not support per row option. $this->mPerRow = 0; } diff --git a/includes/gallery/PackedOverlayImageGallery.php b/includes/gallery/PackedOverlayImageGallery.php index 01360d05..e1ee7faf 100644 --- a/includes/gallery/PackedOverlayImageGallery.php +++ b/includes/gallery/PackedOverlayImageGallery.php @@ -40,7 +40,7 @@ class PackedOverlayImageGallery extends PackedImageGallery { # ATTENTION: The newline after <div class="gallerytext"> is needed to # accommodate htmltidy which in version 4.8.6 generated crackpot HTML - # in its absence, see: http://bugzilla.wikimedia.org/show_bug.cgi?id=1765 + # in its absence, see: https://phabricator.wikimedia.org/T3765 # -Ævar $thumbWidth = $this->getGBWidth( $thumb ) - $this->getThumbPadding() - $this->getGBPadding(); diff --git a/includes/gallery/TraditionalImageGallery.php b/includes/gallery/TraditionalImageGallery.php index 7a0206c2..181c7b8e 100644 --- a/includes/gallery/TraditionalImageGallery.php +++ b/includes/gallery/TraditionalImageGallery.php @@ -49,8 +49,10 @@ class TraditionalImageGallery extends ImageGalleryBase { if ( $this->mParser ) { $this->mParser->getOutput()->addModules( $modules ); + $this->mParser->getOutput()->addModuleStyles( 'mediawiki.page.gallery.styles' ); } else { $this->getOutput()->addModules( $modules ); + $this->getOutput()->addModuleStyles( 'mediawiki.page.gallery.styles' ); } $output = Xml::openElement( 'ul', $attribs ); if ( $this->mCaption ) { @@ -205,7 +207,7 @@ class TraditionalImageGallery extends ImageGalleryBase { protected function wrapGalleryText( $galleryText, $thumb ) { # ATTENTION: The newline after <div class="gallerytext"> is needed to # accommodate htmltidy which in version 4.8.6 generated crackpot html in - # its absence, see: http://bugzilla.wikimedia.org/show_bug.cgi?id=1765 + # its absence, see: https://phabricator.wikimedia.org/T3765 # -Ævar return "\n\t\t\t" . '<div class="gallerytext">' . "\n" |