Pass the parameters to the error message in UploadStash::stashFile().

Currently it shows the error message without any parameters since
$error is an array with the message name and its parameters, and
the Message class thinks that this is a message with its fallbacks
(see wfMessageFallback())

Change-Id: I5d825144795ad108f0a71f90cc530629c5c98a41

diff --git a/includes/upload/UploadStash.php b/includes/upload/UploadStash.php
index bbee0f5..aa65ffe 100644 (file)
--- a/includes/upload/UploadStash.php
+++ b/includes/upload/UploadStash.php
@@ -239,7 +239,8 @@ class UploadStash {
                                }
                        }
                        // at this point, $error should contain the single "most important" error, plus any parameters.
-                       throw new UploadStashFileException( "Error storing file in '$path': " . wfMessage( $error )->text() );
+                       $errorMsg = array_shift( $error );
+                       throw new UploadStashFileException( "Error storing file in '$path': " . wfMessage( $errorMsg, $error )->text() );
                }
                $stashPath = $storeStatus->value;