dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Converted InfoAction to using the WAN cache"
[lhc/web/wiklou.git]
/
includes
/
api
/
ApiOpenSearch.php
diff --git
a/includes/api/ApiOpenSearch.php
b/includes/api/ApiOpenSearch.php
index
f24a03f
..
36026c2
100644
(file)
--- a/
includes/api/ApiOpenSearch.php
+++ b/
includes/api/ApiOpenSearch.php
@@
-212,6
+212,7
@@
class ApiOpenSearch extends ApiBase {
switch ( $this->getFormat() ) {
case 'json':
// http://www.opensearch.org/Specifications/OpenSearch/Extensions/Suggestions/1.1
switch ( $this->getFormat() ) {
case 'json':
// http://www.opensearch.org/Specifications/OpenSearch/Extensions/Suggestions/1.1
+ $result->addArrayType( null, 'BCarray' );
$result->addValue( null, 0, strval( $search ) );
$terms = array();
$descriptions = array();
$result->addValue( null, 0, strval( $search ) );
$terms = array();
$descriptions = array();
@@
-237,23
+238,24
@@
class ApiOpenSearch extends ApiBase {
);
$items = array();
foreach ( $results as $r ) {
);
$items = array();
foreach ( $results as $r ) {
- $item = array();
- $result->setContent( $item, $r['title']->getPrefixedText(), 'Text' );
- $result->setContent( $item, $r['url'], 'Url' );
+ $item = array(
+ 'Text' => $r['title']->getPrefixedText(),
+ 'Url' => $r['url'],
+ );
if ( is_string( $r['extract'] ) && $r['extract'] !== '' ) {
if ( is_string( $r['extract'] ) && $r['extract'] !== '' ) {
- $
result->setContent( $item, $r['extract'], 'Description' )
;
+ $
item['Description'] = $r['extract']
;
}
if ( is_array( $r['image'] ) && isset( $r['image']['source'] ) ) {
$item['Image'] = array_intersect_key( $r['image'], $imageKeys );
}
}
if ( is_array( $r['image'] ) && isset( $r['image']['source'] ) ) {
$item['Image'] = array_intersect_key( $r['image'], $imageKeys );
}
+ ApiResult::setSubelementsList( $item, array_keys( $item ) );
$items[] = $item;
}
$items[] = $item;
}
-
$result->
setIndexedTagName( $items, 'Item' );
+
ApiResult::
setIndexedTagName( $items, 'Item' );
$result->addValue( null, 'version', '2.0' );
$result->addValue( null, 'xmlns', 'http://opensearch.org/searchsuggest2' );
$result->addValue( null, 'version', '2.0' );
$result->addValue( null, 'xmlns', 'http://opensearch.org/searchsuggest2' );
- $query = array();
- $result->setContent( $query, strval( $search ) );
- $result->addValue( null, 'Query', $query );
+ $result->addValue( null, 'Query', strval( $search ) );
+ $result->addSubelementsList( null, 'Query' );
$result->addValue( null, 'Section', $items );
break;
$result->addValue( null, 'Section', $items );
break;