From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Wed, 8 Feb 2012 23:25:58 +0000 (+0000)
Subject: r110979: removed implode() call and format the message as plaintext, as any HTML... 
X-Git-Tag: 1.31.0-rc.0~24850
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22calendrier%22%2C%22type=semaine%22%29%20.%20%22?a=commitdiff_plain;h=16dc83e8e4a231e58b1d27eb671e73ddfe883852;p=lhc%2Fweb%2Fwiklou.git

r110979: removed implode() call and format the message as plaintext, as any HTML will be escaped anyway for such exceptions.
---

diff --git a/includes/upload/UploadStash.php b/includes/upload/UploadStash.php
index 14560ddfd6..ad153d2fc3 100644
--- a/includes/upload/UploadStash.php
+++ b/includes/upload/UploadStash.php
@@ -215,7 +215,7 @@ class UploadStash {
 				}
 			}
 			// 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 ) ) );
+			throw new UploadStashFileException( "Error storing file in '$path': " . wfMessage( $error )->text() );
 		}
 		$stashPath = $storeStatus->value;