X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Fapi%2FApiOpenSearch.php;h=0adb464d5ab20d1ea6fdf29f8a294447a2b5c4ba;hb=70e760ee4e37edad1be0573b37c17fe6899e4806;hp=a93b7cc6989d206cfd0ec72aae239aafb8dc738e;hpb=5bb693f6d4551623dfbb3ba7bf6060a3ce5106b1;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/api/ApiOpenSearch.php b/includes/api/ApiOpenSearch.php
index a93b7cc698..0adb464d5a 100644
--- a/includes/api/ApiOpenSearch.php
+++ b/includes/api/ApiOpenSearch.php
@@ -384,13 +384,25 @@ class ApiOpenSearchFormatJson extends ApiFormatJson {
 
 	public function execute() {
 		if ( !$this->getResult()->getResultData( 'error' ) ) {
-			$warnings = $this->getResult()->removeValue( 'warnings', null );
+			$result = $this->getResult();
+
+			// Ignore warnings or treat as errors, as requested
+			$warnings = $result->removeValue( 'warnings', null );
 			if ( $this->warningsAsError && $warnings ) {
 				$this->dieUsage(
 					'Warnings cannot be represented in OpenSearch JSON format', 'warnings', 0,
 					array( 'warnings' => $warnings )
 				);
 			}
+
+			// Ignore any other unexpected keys (e.g. from $wgDebugToolbar)
+			$remove = array_keys( array_diff_key(
+				$result->getResultData(),
+				array( 0 => 'search', 1 => 'terms', 2 => 'descriptions', 3 => 'urls' )
+			) );
+			foreach ( $remove as $key ) {
+				$result->removeValue( $key, null );
+			}
 		}
 
 		parent::execute();