From: Leo Koppelkamm Date: Sat, 23 Apr 2011 09:55:42 +0000 (+0000) Subject: Reverting r86749: The alt stuff is far too simplistic. One way to fix it would be... X-Git-Tag: 1.31.0-rc.0~30617 X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/banques/%7B%7B%20url_for%28%27admin_users%27%29%20%7D%7D?a=commitdiff_plain;h=8548adf48f97d2f9336ecbd06627dea5c5cc8975;p=lhc%2Fweb%2Fwiklou.git Reverting r86749: The alt stuff is far too simplistic. One way to fix it would be to generalize makeImage() in the parser to process gallery params as well, but I don't have time to that now --- diff --git a/includes/ImageGallery.php b/includes/ImageGallery.php index 9a372020a4..f490a381ee 100644 --- a/includes/ImageGallery.php +++ b/includes/ImageGallery.php @@ -136,15 +136,14 @@ class ImageGallery * 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" ); } @@ -152,15 +151,14 @@ class ImageGallery * 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 ) ); } @@ -220,16 +218,15 @@ class ImageGallery 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
  • {$this->mCaption}
    • "; + $s .= "\n\t
  • {$this->mCaption}
    • "; } $params = array( 'width' => $this->mWidths, 'height' => $this->mHeights ); @@ -237,7 +234,6 @@ class ImageGallery 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 ) { @@ -276,19 +272,18 @@ class ImageGallery $thumbhtml = "\n\t\t\t".'
    ' . htmlspecialchars( $img->getLastError() ) . '
    '; } 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(); } @@ -313,14 +308,14 @@ class ImageGallery 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
    \n"; + $nb = "$nb
    \n"; } else { - $fileSize = ''; + $nb = ''; } $textlink = $this->mShowFilename ? @@ -337,20 +332,20 @@ class ImageGallery # 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" . '
  • ' . '
    ' . $thumbhtml . "\n\t\t\t" . '
    ' . "\n" - . $textlink . $text . $fileSize + . $textlink . $text . $nb . "\n\t\t\t
    " . "\n\t\t
    • "; } - $output .= "\n"; + $s .= "\n"; - return $output; + return $s; } /** diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php index 3dcfe4292c..ad4ba77b9e 100644 --- a/includes/parser/Parser.php +++ b/includes/parser/Parser.php @@ -4733,37 +4733,21 @@ class Parser { 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(); } diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt index 97a65f48e4..fd2838855b 100644 --- a/tests/parser/parserTests.txt +++ b/tests/parser/parserTests.txt @@ -7312,7 +7312,6 @@ File:Nonexistant.jpg|caption File:Nonexistant.jpg image:foobar.jpg|some '''caption''' [[Main Page]] image:foobar.jpg -image:foobar.jpg|Blabla|alt= This is a foo-bar.|blabla. !! result !! end @@ -7432,6 +7424,17 @@ foobar.jpg !! end +!! test +Gallery with wikitext inside caption +!! input + +File:Wiki.png|[[File:Wiki.png|20px|desc|alt=inneralt]]|alt=galleryalt +File:Wiki.png|{{tl|test|alt=param}}|alt=galleryalt + +!! result + +!! end + !! test HTML Hex character encoding (spells the word "JavaScript") !! input