Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ApiOpenSearch: Ignore any other unexpected keys in json output

Browse source 
Iad295d2f fixed warnings to not break the opensearch json output. But
other stuff like $wgDebugToolbar can do the same thing, so let's strip
all unrecognized keys to avoid that problem.

Bug: T100635
Change-Id: I20b6502482af537ccb703f400508960038213a91
This commit is contained in:
Brad Jorsch 2015-05-28 10:38:19 -04:00 committed by Umherirrender
parent 2d6d301dea
commit 0e6b9fdb6f
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
includes/api/ApiOpenSearch.php
View file

@ -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();