Merge "Remove maintenance script deleteImageMemcached.php"

diff --git a/includes/api/ApiOpenSearch.php b/includes/api/ApiOpenSearch.php
index 16d8b55..a93b7cc 100644 (file)
--- a/includes/api/ApiOpenSearch.php
+++ b/includes/api/ApiOpenSearch.php
@@ -384,7 +384,7 @@ class ApiOpenSearchFormatJson extends ApiFormatJson {
 
        public function execute() {
                if ( !$this->getResult()->getResultData( 'error' ) ) {
-                       $warnings = $this->getResult()->removeValue( 'warnings' );
+                       $warnings = $this->getResult()->removeValue( 'warnings', null );
                        if ( $this->warningsAsError && $warnings ) {
                                $this->dieUsage(
                                        'Warnings cannot be represented in OpenSearch JSON format', 'warnings', 0,