And while I'm at it: removed unused global declarations of $wgFeedClasses

[lhc/web/wiklou.git] / includes / ImagePage.php

diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index c42c736..40cbe7c 100644 (file)
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -230,14 +230,18 @@ class ImagePage extends Article {
         * @return string
         */
        protected function showTOC( $metadata ) {
-               global $wgLang;
-               $r = '<ul id="filetoc">
-                       <li><a href="#file">' . wfMsgHtml( 'file-anchor-link' ) . '</a></li>
-                       <li><a href="#filehistory">' . wfMsgHtml( 'filehist' ) . '</a></li>
-                       <li><a href="#filelinks">' . wfMsgHtml( 'imagelinks' ) . "</a></li>\n" .
-                       ($metadata ? '                  <li><a href="#metadata">' . wfMsgHtml( 'metadata' ) . '</a></li>' : '') . "
-                       </ul>\n";
-               return $r;
+               $r = array(
+                               '<li><a href="#file">' . wfMsgHtml( 'file-anchor-link' ) . '</a></li>',
+                               '<li><a href="#filehistory">' . wfMsgHtml( 'filehist' ) . '</a></li>',
+                               '<li><a href="#filelinks">' . wfMsgHtml( 'imagelinks' ) . '</a></li>', 
+               );
+               if ( $metadata ) {
+                       $r[] = '<li><a href="#metadata">' . wfMsgHtml( 'metadata' ) . '</a></li>';
+               }
+       
+               wfRunHooks( 'ImagePageShowTOC', array( $this, &$r ) );
+               
+               return '<ul id="filetoc">' . implode( "\n", $r ) . '</ul>';
        }
 
        /**
@@ -325,7 +329,7 @@ class ImagePage extends Article {
                        $linkAttribs = array( 'href' => $full_url );
                        $longDesc = $this->displayImg->getLongDesc();
 
-                       wfRunHooks( 'ImageOpenShowImageInlineBefore', array( &$this , &$wgOut ) )       ;
+                       wfRunHooks( 'ImageOpenShowImageInlineBefore', array( &$this, &$wgOut ) );
 
                        if( $this->displayImg->allowInlineDisplay() ) {
                                # image
@@ -370,7 +374,8 @@ class ImagePage extends Article {
                                                '<br />' . Xml::tags( 'a', $linkAttribs,  $msgbig ) . "$dirmark " . $longDesc;
                                }
 
-                               if( $this->displayImg->isMultipage() ) {
+                               $isMulti = $this->displayImg->isMultipage() && $this->displayImg->pageCount() > 1;
+                               if( $isMulti ) {
                                        $wgOut->addHTML( '<table class="multipageimage"><tr><td>' );
                                }
 
@@ -384,7 +389,7 @@ class ImagePage extends Article {
                                                $anchorclose . "</div>\n" );
                                }
 
-                               if( $this->displayImg->isMultipage() ) {
+                               if( $isMulti ) {
                                        $count = $this->displayImg->pageCount();
 
                                        if( $page > 1 ) {
@@ -870,7 +875,7 @@ class ImageHistoryList {
                        $canHide = $wgUser->isAllowed( 'deleterevision' );
                        if( $canHide || ($wgUser->isAllowed('deletedhistory') && $file->getVisibility()) ) {
                                if( $wgUser->isAllowed('delete') ) {
-                                       $row .= '<br/>';
+                                       $row .= '<br />';
                                }
                                // If file is top revision or locked from this user, don't link
                                if( $iscur || !$file->userCan(File::DELETED_RESTRICTED) ) {
@@ -1016,7 +1021,7 @@ class ImageHistoryPseudoPager extends ReverseChronologicalPager {
                $this->mImagePage = $imagePage;
                $this->mTitle = clone( $imagePage->getTitle() );
                $this->mTitle->setFragment( '#filehistory' );
-               $this->mImg = NULL;
+               $this->mImg = null;
                $this->mHist = array();
                $this->mRange = array( 0, 0 ); // display range
        }