Merge "mediawiki.cldr: Use require() for pluralruleparser"

[lhc/web/wiklou.git] / includes / api / ApiMain.php

diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php
index 9bffb90..a7e3c1b 100644 (file)
--- a/includes/api/ApiMain.php
+++ b/includes/api/ApiMain.php
@@ -593,7 +593,7 @@ class ApiMain extends ApiBase {
                $this->setCacheMode( 'private' );
 
                $response = $this->getRequest()->response();
-               $headerStr = 'MediaWiki-API-Error: ' . join( ', ', $errCodes );
+               $headerStr = 'MediaWiki-API-Error: ' . implode( ', ', $errCodes );
                $response->header( $headerStr );
 
                // Reset and print just the error message
@@ -1397,9 +1397,9 @@ class ApiMain extends ApiBase {
                        $this->getRequest()->response()->statusHeader( 304 );
 
                        // Avoid outputting the compressed representation of a zero-length body
-                       MediaWiki\suppressWarnings();
+                       Wikimedia\suppressWarnings();
                        ini_set( 'zlib.output_compression', 0 );
-                       MediaWiki\restoreWarnings();
+                       Wikimedia\restoreWarnings();
                        wfClearOutputBuffers();
 
                        return false;