* Add an image to the gallery.
*
* @param $title Title object of the image that is added to the gallery
- * @param $html String: Additional HTML text to be shown. The name and size of the image are always shown.
- * @param $alt String: Alt text for the image
+ * @param $html String: additional HTML text to be shown. The name and size of the image are always shown.
*/
- function add( $title, $html = '', $alt = '' ) {
+ function add( $title, $html='' ) {
if ( $title instanceof File ) {
// Old calling convention
$title = $title->getTitle();
}
- $this->mImages[] = array( $title, $html, $alt );
+ $this->mImages[] = array( $title, $html );
wfDebug( "ImageGallery::add " . $title->getText() . "\n" );
}
* Add an image at the beginning of the gallery.
*
* @param $title Title object of the image that is added to the gallery
- * @param $html String: Additional HTML text to be shown. The name and size of the image are always shown.
- * @param $alt String: Alt text for the image
+ * @param $html String: Additional HTML text to be shown. The name and size of the image are always shown.
*/
- function insert( $title, $html='', $alt='' ) {
+ function insert( $title, $html='' ) {
if ( $title instanceof File ) {
// Old calling convention
$title = $title->getTitle();
}
- array_unshift( $this->mImages, array( &$title, $html, $alt ) );
+ array_unshift( $this->mImages, array( &$title, $html ) );
}
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'] : "";
- # _width is ignored by any sane browser. IE6 doesn't know max-width so it uses _width instead
$this->mAttribs['style'] = "max-width: {$maxwidth}px;_width: {$maxwidth}px;" . $oldStyle;
}
$attribs = Sanitizer::mergeAttributes(
array( 'class' => 'gallery' ), $this->mAttribs );
- $output = Xml::openElement( 'ul', $attribs );
+ $s = Xml::openElement( 'ul', $attribs );
if ( $this->mCaption ) {
- $output .= "\n\t<li class='gallerycaption'>{$this->mCaption}</li>";
+ $s .= "\n\t<li class='gallerycaption'>{$this->mCaption}</li>";
}
$params = array( 'width' => $this->mWidths, 'height' => $this->mHeights );
foreach ( $this->mImages as $pair ) {
$nt = $pair[0];
$text = $pair[1]; # "text" means "caption" here
- $alt = $pair[2];
$descQuery = false;
if ( $nt->getNamespace() == NS_FILE ) {
$thumbhtml = "\n\t\t\t".'<div style="height: '.(self::THUMB_PADDING + $this->mHeights).'px;">'
. htmlspecialchars( $img->getLastError() ) . '</div>';
} else {
- # We get layout problems with the margin, if the image is smaller
- # than the line-height (17), so we add less margin in these cases.
+ //We get layout problems with the margin, if the image is smaller
+ //than the line-height, so we less margin in these cases.
$minThumbHeight = $thumb->height > 17 ? $thumb->height : 17;
$vpad = floor(( self::THUMB_PADDING + $this->mHeights - $minThumbHeight ) /2);
$imageParameters = array(
'desc-link' => true,
- 'desc-query' => $descQuery,
- 'alt' => $alt,
+ 'desc-query' => $descQuery
);
- # In the absence of both alt text and caption, fall back on providing screen readers with the filename as alt text
- if ( $alt == '' && $text == '' ) {
+ # In the absence of a caption, fall back on providing screen readers with the filename as alt text
+ if ( $text == '' ) {
$imageParameters['alt'] = $nt->getText();
}
if( $this->mShowBytes ) {
if( $img ) {
- $fileSize = wfMsgExt( 'nbytes', array( 'parsemag', 'escape'),
+ $nb = wfMsgExt( 'nbytes', array( 'parsemag', 'escape'),
$wgLang->formatNum( $img->getSize() ) );
} else {
- $fileSize = wfMsgHtml( 'filemissing' );
+ $nb = wfMsgHtml( 'filemissing' );
}
- $fileSize = "$fileSize<br />\n";
+ $nb = "$nb<br />\n";
} else {
- $fileSize = '';
+ $nb = '';
}
$textlink = $this->mShowFilename ?
# in version 4.8.6 generated crackpot html in its absence, see:
# http://bugzilla.wikimedia.org/show_bug.cgi?id=1765 -Ævar
- # Weird double wrapping (the extra div inside the li) needed due to FF2 bug
+ # Weird double wrapping in div needed due to FF2 bug
# Can be safely removed if FF2 falls completely out of existance
- $output .=
+ $s .=
"\n\t\t" . '<li class="gallerybox" style="width: ' . ( $this->mWidths + self::THUMB_PADDING + self::GB_PADDING ) . 'px">'
. '<div style="width: ' . ( $this->mWidths + self::THUMB_PADDING + self::GB_PADDING ) . 'px">'
. $thumbhtml
. "\n\t\t\t" . '<div class="gallerytext">' . "\n"
- . $textlink . $text . $fileSize
+ . $textlink . $text . $nb
. "\n\t\t\t</div>"
. "\n\t\t</div></li>";
}
- $output .= "\n</ul>";
+ $s .= "\n</ul>";
- return $output;
+ return $s;
}
/**
if ( strpos( $matches[0], '%' ) !== false ) {
$matches[1] = rawurldecode( $matches[1] );
}
- $title = Title::newFromText( $matches[1], NS_FILE );
- if ( is_null( $title ) ) {
+ $tp = Title::newFromText( $matches[1], NS_FILE );
+ $nt =& $tp;
+ if ( is_null( $nt ) ) {
# Bogus title. Ignore these so we don't bomb out later.
continue;
}
-
- $label = '';
- $alt = '';
if ( isset( $matches[3] ) ) {
- // look for an |alt= definition while trying not to break existing
- // captions with multiple pipes (|) in it, until a more sensible grammar
- // is defined for images in galleries
-
- $altmatches = StringUtils::explode('|', $matches[3]);
-
- foreach ( $altmatches as $altmatch ) {
- if ( substr( $altmatch, 0, 4 ) === 'alt=' ) {
- $alt = $this->stripAltText( trim( substr( $altmatch, 4 ) ), false );
- }
- else {
- // concatenate all other pipes
- $label .= '|' . $altmatch;
- }
- }
- // remove the first pipe
- $label = substr( $label, 1 );
+ $label = $matches[3];
+ } else {
+ $label = '';
}
$html = $this->recursiveTagParse( trim( $label ) );
- $ig->add( $title, $html, $alt );
+ $ig->add( $nt, $html );
}
return $ig->toHTML();
}