Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert r63197 '(bug 12797) Allow adjusting of default gallery display options' Breaks gallery parser test, also I don't really like introducing 5 new globals for this...maybe 1 array with keys?

Browse source
This commit is contained in:
Chad Horohoe 2010-03-05 00:27:20 +00:00
parent fc0ca2a1b4
commit b3a382a0d5
4 changed files with 5 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CREDITS
View file

@ -117,7 +117,6 @@ following names for their contribution to the product.
* Stefano Codari
* Str4nd
* svip
* Zachary Hauri
== Translators ==
* Anders Wegge Jakobsen

3
RELEASE-NOTES
View file

@ -19,9 +19,6 @@ Those wishing to use the latest code instead of a branch release can obtain
it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
=== Configuration changes in 1.17 ===
* (bug 12797) Allow adjusting of default gallery display options:
$wgGalleryImagesPerRow, $wgGalleryImageWidth, $wgGalleryImageHeight
$wgGalleryCaptionLength, $wgGalleryShowBytes
* DatabaseFunctions.php that was needed for compatibility with pre-1.3 extensions
has been removed.

25
includes/DefaultSettings.php
View file

@ -3039,31 +3039,6 @@ $wgThumbLimits = array(
*/
$wgThumbUpright = 0.75;
/**
* Adjust the default number of images per-row in the gallery.
*/
$wgGalleryImagesPerRow = 3;
/**
* Adjust the width of the cells containing images in galleries (in "px")
*/
$wgGalleryImageWidth = 200;
/**
* Adjust the height of the cells containing images in galleries (in "px")
*/
$wgGalleryImageHeight = 200;
/**
* The length of caption to truncate to by default (in characters)
*/
$wgGalleryCaptionLength = 10;
/**
* Should the gallerys in categoryes show the filesize in bytes?
*/
$wgGalleryShowBytes = true;
/**
* On category pages, show thumbnail gallery for images belonging to that
* category instead of listing them as articles.

12
includes/ImageGallery.php
View file

@ -32,22 +32,20 @@ class ImageGallery
*/
private $contextTitle = false;
private $mPerRow = 4; // How many images wide should the gallery be?
private $mWidths = 120, $mHeights = 120; // How wide/tall each thumbnail should be
private $mAttribs = array();
/**
* Create a new image gallery object.
*/
function __construct( ) {
global $wgGalleryImagesPerRow, $wgGalleryImageWidth, $wgGalleryImageHeight, $wgGalleryShowBytes, $wgGalleryCaptionLength;
$this->mImages = array();
$this->mShowBytes = $wgGalleryShowBytes;
$this->mShowBytes = true;
$this->mShowFilename = true;
$this->mParser = false;
$this->mHideBadImages = false;
$this->mPerRow = $wgGalleryImagesPerRow;
$this->mWidths = $wgGalleryImageWidth;
$this->mHeights = $wgGalleryImageHeight;
$this->mCaptionLength = $wgGalleryCaptionLength;
}
/**
@ -310,7 +308,7 @@ class ImageGallery
$textlink = $this->mShowFilename ?
$sk->link(
$nt,
htmlspecialchars( $wgLang->truncate( $nt->getText(), $this->mCaptionLength ) ),
htmlspecialchars( $wgLang->truncate( $nt->getText(), 20 ) ),
array(),
array(),
array( 'known', 'noclasses' )