Merge "Check for error before outputting srcset urls"

diff --combined includes/Linker.php
index 05bace5,9e1bc5b..f0b16ab
--- 1/includes/Linker.php
--- 2/includes/Linker.php
+++ b/includes/Linker.php
@@@ -25,7 -25,7 +25,7 @@@
   * for primarily page content: links, embedded images, table of contents. Links
   * are also used in the skin.
   *
 - * @todo: turn this into a legacy interface for HtmlPageLinkRenderer and similar services.
 + * @todo turn this into a legacy interface for HtmlPageLinkRenderer and similar services.
   *
   * @ingroup Skins
   */
@@@ -259,7 -259,6 +259,7 @@@ class Linker 
  
        /**
         * Identical to link(), except $options defaults to 'known'.
 +       * @see Linker::link
         * @return string
         */
        public static function linkKnown(
@@@ -273,7 -272,7 +273,7 @@@
         * Returns the Url used to link to a Title
         *
         * @param Title $target
 -       * @param array $query query parameters
 +       * @param array $query Query parameters
         * @param array $options
         * @return string
         */
@@@ -703,7 -702,6 +703,7 @@@
         * frame parameters supplied by the Parser.
         * @param array $frameParams The frame parameters
         * @param string $query An optional query string to add to description page links
 +       * @param Parser|null $parser
         * @return array
         */
        private static function getImageLinkMTOParams( $frameParams, $query = '', $parser = null ) {
@@@ -772,6 -770,7 +772,6 @@@
        public static function makeThumbLink2( Title $title, $file, $frameParams = array(),
                $handlerParams = array(), $time = false, $query = ""
        ) {
 -              global $wgStylePath, $wgContLang;
                $exists = $file && $file->exists();
  
                # Shortcuts
@@@ -880,7 -879,12 +880,7 @@@
                                                'href' => $url,
                                                'class' => 'internal',
                                                'title' => wfMessage( 'thumbnail-more' )->text() ),
 -                                              Html::element( 'img', array(
 -                                                      'src' => $wgStylePath . '/common/images/magnify-clip'
 -                                                              . ( $wgContLang->isRTL() ? '-rtl' : '' ) . '.png',
 -                                                      'width' => 15,
 -                                                      'height' => 11,
 -                                                      'alt' => "" ) ) ) );
 +                                              "" ) );
                        }
                }
                $s .= '  <div class="thumbcaption">' . $zoomIcon . $fp['caption'] . "</div></div></div>";
@@@ -909,10 -913,10 +909,10 @@@
  
                        $thumb15 = $file->transform( $hp15 );
                        $thumb20 = $file->transform( $hp20 );
-                       if ( $thumb15 && $thumb15->getUrl() !== $thumb->getUrl() ) {
+                       if ( $thumb15 && !$thumb15->isError() && $thumb15->getUrl() !== $thumb->getUrl() ) {
                                $thumb->responsiveUrls['1.5'] = $thumb15->getUrl();
                        }
-                       if ( $thumb20 && $thumb20->getUrl() !== $thumb->getUrl() ) {
+                       if ( $thumb20 && !$thumb20->isError() && $thumb20->getUrl() !== $thumb->getUrl() ) {
                                $thumb->responsiveUrls['2'] = $thumb20->getUrl();
                        }
                }
@@@ -933,7 -937,7 +933,7 @@@
                $query = '', $unused1 = '', $unused2 = '', $time = false
        ) {
                global $wgEnableUploads, $wgUploadMissingFileUrl, $wgUploadNavigationUrl;
 -              if ( ! $title instanceof Title ) {
 +              if ( !$title instanceof Title ) {
                        return "<!-- ERROR -->" . htmlspecialchars( $label );
                }
                wfProfileIn( __METHOD__ );
@@@ -1375,7 -1379,7 +1375,7 @@@
                                                . '<span dir="auto">' . $auto . $post . '</span>';
                                }
                                return $comment;
 -              },
 +                      },
                        $comment
                );
        }
@@@ -1414,11 -1418,7 +1414,11 @@@
  
                                # fix up urlencoded title texts (copied from Parser::replaceInternalLinks)
                                if ( strpos( $match[1], '%' ) !== false ) {
 -                                      $match[1] = str_replace( array( '<', '>' ), array( '&lt;', '&gt;' ), rawurldecode( $match[1] ) );
 +                                      $match[1] = str_replace(
 +                                              array( '<', '>' ),
 +                                              array( '&lt;', '&gt;' ),
 +                                              rawurldecode( $match[1] )
 +                                      );
                                }
  
                                # Handle link renaming [[foo|text]] will show link as "text"
@@@ -2198,7 -2198,7 +2198,7 @@@
         *
         * @param User $user
         * @param Revision $rev
 -       * @param Revision $title
 +       * @param Title $title
         * @return string HTML fragment
         */
        public static function getRevDeleteLink( User $user, Revision $rev, Title $title ) {