Merge "Making missing old files not try to render a thumbnail"

diff --combined includes/filerepo/file/File.php
index 4fab33b,d81bedc..ba2d4ac
--- 1/includes/filerepo/file/File.php
--- 2/includes/filerepo/file/File.php
+++ b/includes/filerepo/file/File.php
@@@ -679,7 -679,7 +679,7 @@@ abstract class File 
        }
  
        /**
 -       * Returns the mime type of the file.
 +       * Returns the MIME type of the file.
         * Overridden by LocalFile, UnregisteredLocalFile
         * STUB
         *
@@@ -714,7 -714,7 +714,7 @@@
         */
        function canRender() {
                if ( !isset( $this->canRender ) ) {
-                       $this->canRender = $this->getHandler() && $this->handler->canRender( $this );
+                       $this->canRender = $this->getHandler() && $this->handler->canRender( $this ) && $this->exists();
                }
  
                return $this->canRender;
@@@ -1261,7 -1261,7 +1261,7 @@@
        /**
         * Creates a temp FS file with the same extension and the thumbnail
         * @param string $thumbPath Thumbnail path
 -       * @returns TempFSFile
 +       * @return TempFSFile
         */
        protected function makeTransformTmpFile( $thumbPath ) {
                $thumbExt = FileBackend::extensionFromPath( $thumbPath );
@@@ -1287,7 -1287,6 +1287,7 @@@
         * Hook into transform() to allow migration of thumbnail files
         * STUB
         * Overridden by LocalFile
 +       * @param string $thumbName
         */
        function migrateThumbFile( $thumbName ) {
        }
@@@ -1331,7 -1330,6 +1331,7 @@@
        /**
         * Get last thumbnailing error.
         * Largely obsolete.
 +       * @return string
         */
        function getLastError() {
                return $this->lastError;
@@@ -1939,7 -1937,7 +1939,7 @@@
         * @note Use getWidth()/getHeight() instead of this method unless you have a
         *  a good reason. This method skips all caches.
         *
 -       * @param string $fileName The path to the file (e.g. From getLocalPathRef() )
 +       * @param string $filePath The path to the file (e.g. From getLocalPathRef() )
         * @return array The width, followed by height, with optionally more things after
         */
        function getImageSize( $filePath ) {