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 "Accessor to get EditPage parent revision ID"
[lhc/web/wiklou.git]
/
includes
/
api
/
ApiQueryAllLinks.php
diff --git
a/includes/api/ApiQueryAllLinks.php
b/includes/api/ApiQueryAllLinks.php
index
a70d019
..
347da89
100644
(file)
--- a/
includes/api/ApiQueryAllLinks.php
+++ b/
includes/api/ApiQueryAllLinks.php
@@
-200,7
+200,9
@@
class ApiQueryAllLinks extends ApiQueryGeneratorBase {
}
if ( is_null( $resultPageSet ) ) {
}
if ( is_null( $resultPageSet ) ) {
- $vals = array();
+ $vals = array(
+ ApiResult::META_TYPE => 'assoc',
+ );
if ( $fld_ids ) {
$vals['fromid'] = intval( $row->pl_from );
}
if ( $fld_ids ) {
$vals['fromid'] = intval( $row->pl_from );
}
@@
-230,7
+232,7
@@
class ApiQueryAllLinks extends ApiQueryGeneratorBase {
}
if ( is_null( $resultPageSet ) ) {
}
if ( is_null( $resultPageSet ) ) {
- $result->
setIndexedTagName_internal
( array( 'query', $this->getModuleName() ), $this->indexTag );
+ $result->
addIndexedTagName
( array( 'query', $this->getModuleName() ), $this->indexTag );
} elseif ( $params['unique'] ) {
$resultPageSet->populateFromTitles( $titles );
} else {
} elseif ( $params['unique'] ) {
$resultPageSet->populateFromTitles( $titles );
} else {
@@
-253,6
+255,7
@@
class ApiQueryAllLinks extends ApiQueryGeneratorBase {
ApiBase::PARAM_TYPE => array_merge(
array( 'ids', 'title' ), array_keys( $this->props )
),
ApiBase::PARAM_TYPE => array_merge(
array( 'ids', 'title' ), array_keys( $this->props )
),
+ ApiBase::PARAM_HELP_MSG_PER_VALUE => array(),
),
'namespace' => array(
ApiBase::PARAM_DFLT => $this->dfltNamespace,
),
'namespace' => array(
ApiBase::PARAM_DFLT => $this->dfltNamespace,