http://www.mediawiki.org/wiki/Special:Code/MediaWiki/76245
Revision: 76245
Author: catrope
Date: 2010-11-07 13:12:49 +0000 (Sun, 07 Nov 2010)
Log Message:
-----------
uploadwizard-deployment: Merge r76175, r76177, r76186 from trunk
Modified Paths:
--------------
branches/uploadwizard-deployment/includes/AutoLoader.php
branches/uploadwizard-deployment/includes/specials/SpecialUploadStash.php
Property Changed:
----------------
branches/uploadwizard-deployment/includes/AutoLoader.php
branches/uploadwizard-deployment/includes/specials/SpecialUploadStash.php
Modified: branches/uploadwizard-deployment/includes/AutoLoader.php
===================================================================
--- branches/uploadwizard-deployment/includes/AutoLoader.php 2010-11-07
13:07:19 UTC (rev 76244)
+++ branches/uploadwizard-deployment/includes/AutoLoader.php 2010-11-07
13:12:49 UTC (rev 76245)
@@ -597,11 +597,16 @@
'UserloginTemplate' => 'includes/templates/Userlogin.php',
# includes/upload
- 'UploadStash' => 'includes/upload/UploadStash.php',
'UploadBase' => 'includes/upload/UploadBase.php',
'UploadFromStash' => 'includes/upload/UploadFromStash.php',
'UploadFromFile' => 'includes/upload/UploadFromFile.php',
'UploadFromUrl' => 'includes/upload/UploadFromUrl.php',
+ 'UploadStash' => 'includes/upload/UploadStash.php',
+ 'UploadStashNotAvailableException' => 'includes/upload/UploadStash.php',
+ 'UploadStashFileNotFoundException' => 'includes/upload/UploadStash.php',
+ 'UploadStashBadPathException' => 'includes/upload/UploadStash.php',
+ 'UploadStashBadVersionException' => 'includes/upload/UploadStash.php',
+ 'UploadStashFileException' => 'includes/upload/UploadStash.php',
# languages
'Language' => 'languages/Language.php',
Property changes on: branches/uploadwizard-deployment/includes/AutoLoader.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/AutoLoader.php:51646
/branches/new-installer/phase3/includes/AutoLoader.php:43664-66004
/branches/sqlite/includes/AutoLoader.php:58211-58321
/branches/uploadwizard/phase3/includes/AutoLoader.php:73550-75905
/branches/wmf-deployment/includes/AutoLoader.php:53381,60970
/trunk/phase3/includes/AutoLoader.php:63549,63764,63897-63901,64113,64509,65387,65391,65555,65590,65650,65816,70037,71059,71098,71942,72024,72120,72525,75906
+ /branches/REL1_15/phase3/includes/AutoLoader.php:51646
/branches/new-installer/phase3/includes/AutoLoader.php:43664-66004
/branches/sqlite/includes/AutoLoader.php:58211-58321
/branches/uploadwizard/phase3/includes/AutoLoader.php:73550-75905
/branches/wmf-deployment/includes/AutoLoader.php:53381,60970
/trunk/phase3/includes/AutoLoader.php:63549,63764,63897-63901,64113,64509,65387,65391,65555,65590,65650,65816,70037,71059,71098,71942,72024,72120,72525,75906,76186
Modified:
branches/uploadwizard-deployment/includes/specials/SpecialUploadStash.php
===================================================================
--- branches/uploadwizard-deployment/includes/specials/SpecialUploadStash.php
2010-11-07 13:07:19 UTC (rev 76244)
+++ branches/uploadwizard-deployment/includes/specials/SpecialUploadStash.php
2010-11-07 13:12:49 UTC (rev 76245)
@@ -113,8 +113,8 @@
// ok we're here so the original must exist. Generate
the thumbnail.
// because the file is a UploadStashFile, this
thumbnail will also be stashed,
// and a thumbnailFile will be created in the
thumbnailImage composite object
- $thumbnailImage = null;
- if ( !( $thumbnailImage = $origFile->getThumbnail(
$width ) ) ) {
+ $thumbnailImage = $origFile->transform( array( 'width'
=> $width ) );
+ if ( !$thumbnailImage ) {
throw new MWException( 'Could not obtain
thumbnail' );
}
$file = $thumbnailImage->thumbnailFile;
Property changes on:
branches/uploadwizard-deployment/includes/specials/SpecialUploadStash.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/specials/SpecialUploadStash.php:51646
/branches/sqlite/includes/specials/SpecialUploadStash.php:58211-58321
/branches/wmf-deployment/includes/specials/SpecialUploadStash.php:53381,56967
/trunk/phase3/includes/specials/SpecialUploadStash.php:73549-75058,75060-75821
+ /branches/REL1_15/phase3/includes/specials/SpecialUploadStash.php:51646
/branches/sqlite/includes/specials/SpecialUploadStash.php:58211-58321
/branches/wmf-deployment/includes/specials/SpecialUploadStash.php:53381,56967
/trunk/phase3/includes/specials/SpecialUploadStash.php:73549-75058,75060-75821,76175,76177,76186
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
