From a8ae8345817638053a39a62f6f0c212a94a155a4 Mon Sep 17 00:00:00 2001 From: Ian Baker Date: Wed, 8 Feb 2012 23:09:19 +0000 Subject: [PATCH] Properly expand the "error storing file" message. Fixes bug 33846 --- includes/upload/UploadStash.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/includes/upload/UploadStash.php b/includes/upload/UploadStash.php index 8c12150dac..14560ddfd6 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; -- 2.20.1