| Index: trunk/phase3/includes/ImagePage.php |
| — | — | @@ -329,7 +329,7 @@ |
| 330 | 330 | $linkAttribs = array( 'href' => $full_url ); |
| 331 | 331 | $longDesc = $this->displayImg->getLongDesc(); |
| 332 | 332 | |
| 333 | | - wfRunHooks( 'ImageOpenShowImageInlineBefore', array( &$this , &$wgOut ) ) ; |
| | 333 | + wfRunHooks( 'ImageOpenShowImageInlineBefore', array( &$this, &$wgOut ) ); |
| 334 | 334 | |
| 335 | 335 | if( $this->displayImg->allowInlineDisplay() ) { |
| 336 | 336 | # image |
| — | — | @@ -374,7 +374,8 @@ |
| 375 | 375 | '<br />' . Xml::tags( 'a', $linkAttribs, $msgbig ) . "$dirmark " . $longDesc; |
| 376 | 376 | } |
| 377 | 377 | |
| 378 | | - if( $this->displayImg->isMultipage() ) { |
| | 378 | + $isMulti = $this->displayImg->isMultipage() && $this->displayImg->pageCount() > 1; |
| | 379 | + if( $isMulti ) { |
| 379 | 380 | $wgOut->addHTML( '<table class="multipageimage"><tr><td>' ); |
| 380 | 381 | } |
| 381 | 382 | |
| — | — | @@ -388,7 +389,7 @@ |
| 389 | 390 | $anchorclose . "</div>\n" ); |
| 390 | 391 | } |
| 391 | 392 | |
| 392 | | - if( $this->displayImg->isMultipage() ) { |
| | 393 | + if( $isMulti ) { |
| 393 | 394 | $count = $this->displayImg->pageCount(); |
| 394 | 395 | |
| 395 | 396 | if( $page > 1 ) { |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -663,6 +663,8 @@ |
| 664 | 664 | * (bug 20159) thumbnails rerendered if older that $wgThumbnailEpoch |
| 665 | 665 | * Fixed a bug which in some situations causes the job queue to grow forever, |
| 666 | 666 | due to an infinite loop of job requeues. |
| | 667 | +* (bug 21523) File that can have multiple pages (djvu, pdf, ...) no longer have |
| | 668 | + the page selector when they have only one page |
| 667 | 669 | |
| 668 | 670 | == API changes in 1.16 == |
| 669 | 671 | |