From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Sun, 17 May 2015 02:44:28 +0000 (+0000)
Subject: Merge "Remove maintenance script deleteImageMemcached.php"
X-Git-Tag: 1.31.0-rc.0~11386
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=b853854389e9e3f9b86cc869ae0c49c3c0413551;hp=eb11a00a1e15bec1c7f0be9028ff20c252b2a0f9;p=lhc%2Fweb%2Fwiklou.git

Merge "Remove maintenance script deleteImageMemcached.php"
---

diff --git a/includes/api/ApiOpenSearch.php b/includes/api/ApiOpenSearch.php
index 16d8b5504a..a93b7cc698 100644
--- 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,