diff options
| author | Ian Baker <raindrift@users.mediawiki.org> | 2012-02-08 23:09:19 +0000 |
|---|---|---|
| committer | Ian Baker <raindrift@users.mediawiki.org> | 2012-02-08 23:09:19 +0000 |
| commit | a8ae8345817638053a39a62f6f0c212a94a155a4 (patch) | |
| tree | d3bd4df511778a15859306e1e29aad8c88ffeeac /includes/upload | |
| parent | 96b0739ffbff9e4ce780cb2b3c7e1d217b6287ba (diff) | |
| download | mediawikicore-a8ae8345817638053a39a62f6f0c212a94a155a4.tar.gz mediawikicore-a8ae8345817638053a39a62f6f0c212a94a155a4.zip | |
Properly expand the "error storing file" message. Fixes bug 33846
Notes
Notes:
http://mediawiki.org/wiki/Special:Code/MediaWiki/110979
Diffstat (limited to 'includes/upload')
| -rw-r--r-- | includes/upload/UploadStash.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/includes/upload/UploadStash.php b/includes/upload/UploadStash.php index 8c12150dac9d..14560ddfd65f 100644 --- a/includes/upload/UploadStash.php +++ b/includes/upload/UploadStash.php @@ -214,7 +214,8 @@ class UploadStash { $error = array( 'unknown', 'no error recorded' ); } } - throw new UploadStashFileException( "Error storing file in '$path': " . implode( '; ', $error ) ); + // at this point, $error should contain the single "most important" error, plus any parameters. + throw new UploadStashFileException( "Error storing file in '$path': " . implode( '; ', wfMessage( $error ) ) ); } $stashPath = $storeStatus->value; |