Merge "Duplicate array keys aren't going to do very much..."

diff --git a/includes/api/ApiBase.php b/includes/api/ApiBase.php
index 5bff0ca..edd9aca 100644 (file)
--- a/includes/api/ApiBase.php
+++ b/includes/api/ApiBase.php
@@ -1195,7 +1195,6 @@ abstract class ApiBase extends ContextSource {
                'toofewexpiries' => array( 'code' => 'toofewexpiries', 'info' => "\$1 expiry timestamps were provided where \$2 were needed" ),
                'cantimport' => array( 'code' => 'cantimport', 'info' => "You don't have permission to import pages" ),
                'cantimport-upload' => array( 'code' => 'cantimport-upload', 'info' => "You don't have permission to import uploaded pages" ),
-               'nouploadmodule' => array( 'code' => 'nomodule', 'info' => 'No upload module set' ),
                'importnofile' => array( 'code' => 'nofile', 'info' => "You didn't upload a file" ),
                'importuploaderrorsize' => array( 'code' => 'filetoobig', 'info' => 'The file you uploaded is bigger than the maximum upload size' ),
                'importuploaderrorpartial' => array( 'code' => 'partialupload', 'info' => 'The file was only partially uploaded' ),