Merge "Fixed and normalized content-disposition for thumbs."

diff --combined includes/filerepo/file/File.php
index 3d1e270,3aa27ec..3b0ea14
--- 1/includes/filerepo/file/File.php
--- 2/includes/filerepo/file/File.php
+++ b/includes/filerepo/file/File.php
@@@ -943,7 -943,7 +943,7 @@@ abstract class File 
                                }
                        } elseif ( $this->repo && $thumb->hasFile() && !$thumb->fileIsSource() ) {
                                // Copy the thumbnail from the file system into storage...
-                               $disposition = FileBackend::makeContentDisposition( 'inline', $this->name );
+                               $disposition = $this->getThumbDisposition( $thumbName );
                                $status = $this->repo->quickImport( $tmpThumbPath, $thumbPath, $disposition );
                                if ( $status->isOK() ) {
                                        $thumb->setStoragePath( $thumbPath );
@@@ -968,6 -968,19 +968,19 @@@
                return is_object( $thumb ) ? $thumb : false;
        }
  
+       /**
+        * @param $thumbName string Thumbnail name
+        * @return string Content-Disposition header value
+        */
+       function getThumbDisposition( $thumbName ) {
+               $fileName = $this->name; // file name to suggest
+               $thumbExt = FileBackend::extensionFromPath( $thumbName );
+               if ( $thumbExt != '' && $thumbExt !== $this->getExtension() ) {
+                       $fileName .= ".$thumbExt";
+               }
+               return FileBackend::makeContentDisposition( 'inline', $fileName );
+       }
+ 
        /**
         * Hook into transform() to allow migration of thumbnail files
         * STUB
@@@ -1000,8 -1013,7 +1013,8 @@@
                        $path = '/common/images/icons/' . $icon;
                        $filepath = $wgStyleDirectory . $path;
                        if ( file_exists( $filepath ) ) { // always FS
 -                              return new ThumbnailImage( $this, $wgStylePath . $path, 120, 120 );
 +                              $params = array( 'width' => 120, 'height' => 120 );
 +                              return new ThumbnailImage( $this, $wgStylePath . $path, false, $params );
                        }
                }
                return null;