| Index: trunk/phase3/includes/parser/Parser.php |
| — | — | @@ -4517,7 +4517,7 @@ |
| 4518 | 4518 | list( $paramMap, $mwArray ) = $this->getImageParams( $handler ); |
| 4519 | 4519 | |
| 4520 | 4520 | # Process the input parameters |
| 4521 | | - $caption = false; |
| | 4521 | + $caption = ''; |
| 4522 | 4522 | $params = array( 'frame' => array(), 'handler' => array(), |
| 4523 | 4523 | 'horizAlign' => array(), 'vertAlign' => array() ); |
| 4524 | 4524 | foreach( $parts as $part ) { |
| — | — | @@ -4584,16 +4584,10 @@ |
| 4585 | 4585 | if ( $params['vertAlign'] ) { |
| 4586 | 4586 | $params['frame']['valign'] = key( $params['vertAlign'] ); |
| 4587 | 4587 | } |
| 4588 | | - |
| 4589 | | - // Process alt text |
| 4590 | | - if ($caption === false) { |
| 4591 | | - // Put the image name in. |
| 4592 | | - $alt = $title->getPrefixedText(); |
| 4593 | | - } else { |
| 4594 | | - # Strip bad stuff out of the alt text |
| 4595 | | - $alt = $this->replaceLinkHoldersText( $caption ); |
| 4596 | | - } |
| 4597 | 4588 | |
| | 4589 | + # Strip bad stuff out of the alt text |
| | 4590 | + $alt = $this->replaceLinkHoldersText( $caption ); |
| | 4591 | + |
| 4598 | 4592 | # make sure there are no placeholders in thumbnail attributes |
| 4599 | 4593 | # that are later expanded to html- so expand them now and |
| 4600 | 4594 | # remove the tags |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -82,7 +82,6 @@ |
| 83 | 83 | Patch by Max Semenik. |
| 84 | 84 | * (bug 15055) Talk page notifications no longer attempt to send mail when |
| 85 | 85 | user's e-mail address is invalid or unconfirmed |
| 86 | | -* (bug 2443) Add image name as alt-text when no caption is provided. |
| 87 | 86 | * (bug 12370) Add throttle on password attempts. Defaults to max 5 attempts in 5 minutes. |
| 88 | 87 | * (bug 15016) 'Templates used on this page' list in view source should be wrapped |
| 89 | 88 | in a div with class "templatesUsed" |