Merge "Introduce new hook UploadVerifyUpload to allow preventing file uploads"

diff --cc docs/hooks.txt
Simple merge

diff --cc includes/api/ApiUpload.php
index 15c1e39,3af0dff..cb8d938
--- 1/includes/api/ApiUpload.php
--- 2/includes/api/ApiUpload.php
+++ b/includes/api/ApiUpload.php
@@@ -347,12 -347,13 +347,13 @@@ class ApiUpload extends ApiBase 
         * Throw an error that the user can recover from by providing a better
         * value for $parameter
         *
 -       * @param array $error Error array suitable for passing to dieUsageMsg()
 +       * @param array|string|MessageSpecifier $error Error suitable for passing to dieUsageMsg()
         * @param string $parameter Parameter that needs revising
         * @param array $data Optional extra data to pass to the user
+        * @param string $code Error code to use if the error is unknown
         * @throws UsageException
         */
-       private function dieRecoverableError( $error, $parameter, $data = [] ) {
+       private function dieRecoverableError( $error, $parameter, $data = [], $code = 'unknownerror' ) {
                try {
                        $data['filekey'] = $this->performStash();
                        $data['sessionkey'] = $data['filekey'];

diff --cc includes/upload/UploadBase.php
Simple merge