X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2FImageGallery.php;h=43cf7f6c6ae20bd3d4b86e6eeead5179b078b826;hb=876bddf6376fe75952735ee3f231f557c2da48d0;hp=037093a165bcc3eac8c9c3decd28508c76fb48d2;hpb=fba656f9861bab41f0d94735bbc5cde672575fd8;p=lhc%2Fweb%2Fwiklou.git
diff --git a/includes/ImageGallery.php b/includes/ImageGallery.php
index 037093a165..43cf7f6c6a 100644
--- a/includes/ImageGallery.php
+++ b/includes/ImageGallery.php
@@ -93,7 +93,7 @@ class ImageGallery {
/**
* Set the caption (as plain text)
*
- * @param $caption string Caption
+ * @param string $caption Caption
*/
function setCaption( $caption ) {
$this->mCaption = htmlspecialchars( $caption );
@@ -102,7 +102,7 @@ class ImageGallery {
/**
* Set the caption (as HTML)
*
- * @param $caption String: Caption
+ * @param string $caption Caption
*/
public function setCaptionHtml( $caption ) {
$this->mCaption = $caption;
@@ -220,7 +220,7 @@ class ImageGallery {
* Note -- if taking from user input, you should probably run through
* Sanitizer::validateAttributes() first.
*
- * @param $attribs Array of HTML attribute pairs
+ * @param array $attribs of HTML attribute pairs
*/
function setAttributes( $attribs ) {
$this->mAttribs = $attribs;
@@ -238,8 +238,6 @@ class ImageGallery {
* @return string
*/
function toHTML() {
- global $wgLang;
-
if ( $this->mPerRow > 0 ) {
$maxwidth = $this->mPerRow * ( $this->mWidths + self::THUMB_PADDING + self::GB_PADDING + self::GB_BORDERS );
$oldStyle = isset( $this->mAttribs['style'] ) ? $this->mAttribs['style'] : '';
@@ -255,6 +253,7 @@ class ImageGallery {
$output .= "\n\t
{$this->mCaption}";
}
+ $lang = $this->getLang();
$params = array(
'width' => $this->mWidths,
'height' => $this->mHeights
@@ -283,11 +282,11 @@ class ImageGallery {
$img = false;
}
- if( !$img ) {
+ if ( !$img ) {
# We're dealing with a non-image, spit out the name and be done with it.
$thumbhtml = "\n\t\t\t" . ''
. htmlspecialchars( $nt->getText() ) . '
';
- } elseif( $this->mHideBadImages && wfIsBadImage( $nt->getDBkey(), $this->getContextTitle() ) ) {
+ } elseif ( $this->mHideBadImages && wfIsBadImage( $nt->getDBkey(), $this->getContextTitle() ) ) {
# The image is blacklisted, just show it as a text link.
$thumbhtml = "\n\t\t\t" . '' .
Linker::link(
@@ -298,12 +297,12 @@ class ImageGallery {
array( 'known', 'noclasses' )
) .
'
';
- } elseif( !( $thumb = $img->transform( $params ) ) ) {
+ } elseif ( !( $thumb = $img->transform( $params ) ) ) {
# Error generating thumbnail.
$thumbhtml = "\n\t\t\t" . ''
. htmlspecialchars( $img->getLastError() ) . '
';
} else {
- $vpad = ( self::THUMB_PADDING + $this->mHeights - $thumb->height ) /2;
+ $vpad = ( self::THUMB_PADDING + $this->mHeights - $thumb->height ) / 2;
$imageParameters = array(
'desc-link' => true,
@@ -335,9 +334,9 @@ class ImageGallery {
// $linkTarget = Title::newFromText( $wgContLang->getNsText( MWNamespace::getUser() ) . ":{$ut}" );
// $ul = Linker::link( $linkTarget, $ut );
- if( $this->mShowBytes ) {
- if( $img ) {
- $fileSize = htmlspecialchars( $wgLang->formatSize( $img->getSize() ) );
+ if ( $this->mShowBytes ) {
+ if ( $img ) {
+ $fileSize = htmlspecialchars( $lang->formatSize( $img->getSize() ) );
} else {
$fileSize = wfMessage( 'filemissing' )->escaped();
}
@@ -349,7 +348,7 @@ class ImageGallery {
$textlink = $this->mShowFilename ?
Linker::link(
$nt,
- htmlspecialchars( $wgLang->truncate( $nt->getText(), $this->mCaptionLength ) ),
+ htmlspecialchars( $lang->truncate( $nt->getText(), $this->mCaptionLength ) ),
array(),
array(),
array( 'known', 'noclasses' )
@@ -361,7 +360,7 @@ class ImageGallery {
# http://bugzilla.wikimedia.org/show_bug.cgi?id=1765 -Ãvar
# Weird double wrapping (the extra div inside the li) needed due to FF2 bug
- # Can be safely removed if FF2 falls completely out of existance
+ # Can be safely removed if FF2 falls completely out of existence
$output .=
"\n\t\t" . ''
. ''
@@ -403,4 +402,15 @@ class ImageGallery {
: false;
}
+ /**
+ * Determines the correct language to be used for this image gallery
+ * @return Language object
+ */
+ private function getLang() {
+ global $wgLang;
+ return $this->mParser
+ ? $this->mParser->getTargetLanguage()
+ : $wgLang;
+ }
+
} //class