Merge "Show no size links on image pages with errors"

diff --combined includes/ImagePage.php
index 2a3e8e8,3d70fa5..953b1f7
--- 1/includes/ImagePage.php
--- 2/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@@ -156,7 -156,7 +156,7 @@@ class ImagePage extends Article 
                        $pageLang = $this->getTitle()->getPageViewLanguage();
                        $out->addHTML( Xml::openElement( 'div', array( 'id' => 'mw-imagepage-content',
                                'lang' => $pageLang->getHtmlCode(), 'dir' => $pageLang->getDir(),
 -                              'class' => 'mw-content-'.$pageLang->getDir() ) ) );
 +                              'class' => 'mw-content-' . $pageLang->getDir() ) ) );
  
                        parent::view();
  
@@@ -369,12 -369,19 +369,19 @@@
                                                if ( $size[0] < $width_orig && $size[1] < $height_orig
                                                        && $size[0] != $width && $size[1] != $height )
                                                {
-                                                       $otherSizes[] = $this->makeSizeLink( $params, $size[0], $size[1] );
+                                                       $sizeLink = $this->makeSizeLink( $params, $size[0], $size[1] );
+                                                       if ( $sizeLink ) {
+                                                               $otherSizes[] = $sizeLink;
+                                                       }
                                                }
                                        }
-                                       $msgsmall = wfMessage( 'show-big-image-preview' )->
-                                               rawParams( $this->makeSizeLink( $params, $width, $height ) )->
-                                               parse();
+                                       $msgsmall = '';
+                                       $sizeLinkBigImagePreview = $this->makeSizeLink( $params, $width, $height );
+                                       if ( $sizeLinkBigImagePreview ) {
+                                               $msgsmall .= wfMessage( 'show-big-image-preview' )->
+                                                       rawParams( $sizeLinkBigImagePreview )->
+                                                       parse();
+                                       }
                                        if ( count( $otherSizes ) ) {
                                                $msgsmall .= ' ' .
                                                Html::rawElement( 'span', array( 'class' => 'mw-filepage-other-resolutions' ),
@@@ -538,7 -545,7 +545,7 @@@ EO
                                        array( 'delete', 'move' ),
                                        $this->getTitle()->getPrefixedText(),
                                        '',
 -                                      array(  'lim' => 10,
 +                                      array( 'lim' => 10,
                                                'conds' => array( "log_action != 'revision'" ),
                                                'showIfEmpty' => false,
                                                'msgKey' => array( 'moveddeleted-notice' )
@@@ -630,7 -637,7 +637,7 @@@
                return $uploadTitle->getFullURL( array(
                        'wpDestFile' => $this->mPage->getFile()->getName(),
                        'wpForReUpload' => 1
 -               ) );
 +              ) );
        }
  
        /**
@@@ -1044,9 -1051,9 +1051,9 @@@ class ImageHistoryList extends ContextS
                                } else {
                                        list( $ts, ) = explode( '!', $img, 2 );
                                        $query = array(
 -                                              'type'   => 'oldimage',
 +                                              'type' => 'oldimage',
                                                'target' => $this->title->getPrefixedText(),
 -                                              'ids'    => $ts,
 +                                              'ids' => $ts,
                                        );
                                        $del = Linker::revDeleteLink( $query,
                                                $file->isDeleted( File::DELETED_RESTRICTED ), $canHide );