From: Ian Baker <raindrift@users.mediawiki.org>
Date: Wed, 8 Feb 2012 23:09:19 +0000 (+0000)
Subject: Properly expand the "error storing file" message.  Fixes bug 33846
X-Git-Tag: 1.31.0-rc.0~24851
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=a8ae8345817638053a39a62f6f0c212a94a155a4;p=lhc%2Fweb%2Fwiklou.git

Properly expand the "error storing file" message.  Fixes bug 33846
---

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;