| Index: branches/uploadwizard-deployment/includes/AutoLoader.php |
| — | — | @@ -597,11 +597,16 @@ |
| 598 | 598 | 'UserloginTemplate' => 'includes/templates/Userlogin.php', |
| 599 | 599 | |
| 600 | 600 | # includes/upload |
| 601 | | - 'UploadStash' => 'includes/upload/UploadStash.php', |
| 602 | 601 | 'UploadBase' => 'includes/upload/UploadBase.php', |
| 603 | 602 | 'UploadFromStash' => 'includes/upload/UploadFromStash.php', |
| 604 | 603 | 'UploadFromFile' => 'includes/upload/UploadFromFile.php', |
| 605 | 604 | 'UploadFromUrl' => 'includes/upload/UploadFromUrl.php', |
| | 605 | + 'UploadStash' => 'includes/upload/UploadStash.php', |
| | 606 | + 'UploadStashNotAvailableException' => 'includes/upload/UploadStash.php', |
| | 607 | + 'UploadStashFileNotFoundException' => 'includes/upload/UploadStash.php', |
| | 608 | + 'UploadStashBadPathException' => 'includes/upload/UploadStash.php', |
| | 609 | + 'UploadStashBadVersionException' => 'includes/upload/UploadStash.php', |
| | 610 | + 'UploadStashFileException' => 'includes/upload/UploadStash.php', |
| 606 | 611 | |
| 607 | 612 | # languages |
| 608 | 613 | 'Language' => 'languages/Language.php', |
| Property changes on: branches/uploadwizard-deployment/includes/AutoLoader.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 609 | 614 | Merged /trunk/phase3/includes/AutoLoader.php:r76186 |
| Index: branches/uploadwizard-deployment/includes/specials/SpecialUploadStash.php |
| — | — | @@ -113,8 +113,8 @@ |
| 114 | 114 | // ok we're here so the original must exist. Generate the thumbnail. |
| 115 | 115 | // because the file is a UploadStashFile, this thumbnail will also be stashed, |
| 116 | 116 | // and a thumbnailFile will be created in the thumbnailImage composite object |
| 117 | | - $thumbnailImage = null; |
| 118 | | - if ( !( $thumbnailImage = $origFile->getThumbnail( $width ) ) ) { |
| | 117 | + $thumbnailImage = $origFile->transform( array( 'width' => $width ) ); |
| | 118 | + if ( !$thumbnailImage ) { |
| 119 | 119 | throw new MWException( 'Could not obtain thumbnail' ); |
| 120 | 120 | } |
| 121 | 121 | $file = $thumbnailImage->thumbnailFile; |
| Property changes on: branches/uploadwizard-deployment/includes/specials/SpecialUploadStash.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 122 | 122 | Merged /trunk/phase3/includes/specials/SpecialUploadStash.php:r76175,76177,76186 |