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 "Account for HiDPI variants in thumb.php rate limiting"
[lhc/web/wiklou.git]
/
includes
/
api
/
ApiPageSet.php
diff --git
a/includes/api/ApiPageSet.php
b/includes/api/ApiPageSet.php
index
39cd6d9
..
e53e2b2
100644
(file)
--- a/
includes/api/ApiPageSet.php
+++ b/
includes/api/ApiPageSet.php
@@
-179,7
+179,7
@@
class ApiPageSet extends ApiBase {
if ( !$isDryRun ) {
$generator->executeGenerator( $this );
if ( !$isDryRun ) {
$generator->executeGenerator( $this );
-
wfRunHooks
( 'APIQueryGeneratorAfterExecute', array( &$generator, &$this ) );
+
Hooks::run
( 'APIQueryGeneratorAfterExecute', array( &$generator, &$this ) );
} else {
// Prevent warnings from being reported on these parameters
$main = $this->getMain();
} else {
// Prevent warnings from being reported on these parameters
$main = $this->getMain();
@@
-315,6
+315,10
@@
class ApiPageSet extends ApiBase {
$pageFlds['page_is_redirect'] = null;
}
$pageFlds['page_is_redirect'] = null;
}
+ if ( $this->getConfig()->get( 'ContentHandlerUseDB' ) ) {
+ $pageFlds['page_content_model'] = null;
+ }
+
// only store non-default fields
$this->mRequestedPageFields = array_diff_key( $this->mRequestedPageFields, $pageFlds );
// only store non-default fields
$this->mRequestedPageFields = array_diff_key( $this->mRequestedPageFields, $pageFlds );
@@
-450,6
+454,9
@@
class ApiPageSet extends ApiBase {
if ( $titleTo->hasFragment() ) {
$r['tofragment'] = $titleTo->getFragment();
}
if ( $titleTo->hasFragment() ) {
$r['tofragment'] = $titleTo->getFragment();
}
+ if ( $titleTo->isExternal() ) {
+ $r['tointerwiki'] = $titleTo->getInterwiki();
+ }
$values[] = $r;
}
if ( !empty( $values ) && $result ) {
$values[] = $r;
}
if ( !empty( $values ) && $result ) {
@@
-1049,7
+1056,9
@@
class ApiPageSet extends ApiBase {
$row->rd_interwiki
);
unset( $this->mPendingRedirectIDs[$rdfrom] );
$row->rd_interwiki
);
unset( $this->mPendingRedirectIDs[$rdfrom] );
- if ( !$to->isExternal() && !isset( $this->mAllPages[$row->rd_namespace][$row->rd_title] ) ) {
+ if ( $to->isExternal() ) {
+ $this->mInterwikiTitles[$to->getPrefixedText()] = $to->getInterwiki();
+ } elseif ( !isset( $this->mAllPages[$row->rd_namespace][$row->rd_title] ) ) {
$lb->add( $row->rd_namespace, $row->rd_title );
}
$this->mRedirectTitles[$from] = $to;
$lb->add( $row->rd_namespace, $row->rd_title );
}
$this->mRedirectTitles[$from] = $to;
@@
-1213,7
+1222,7
@@
class ApiPageSet extends ApiBase {
*
* @param ApiResult|array &$result
* @param array $path
*
* @param ApiResult|array &$result
* @param array $path
- * @return bool
ean
Whether the data fit
+ * @return bool Whether the data fit
*/
public function populateGeneratorData( &$result, array $path = array() ) {
if ( $result instanceof ApiResult ) {
*/
public function populateGeneratorData( &$result, array $path = array() ) {
if ( $result instanceof ApiResult ) {
@@
-1326,7
+1335,13
@@
class ApiPageSet extends ApiBase {
ApiBase::PARAM_DFLT => false,
ApiBase::PARAM_HELP_MSG => array(
'api-pageset-param-converttitles',
ApiBase::PARAM_DFLT => false,
ApiBase::PARAM_HELP_MSG => array(
'api-pageset-param-converttitles',
- $this->getLanguage()->commaList( LanguageConverter::$languagesWithVariants ),
+ new DeferredStringifier(
+ function ( IContextSource $context ) {
+ return $context->getLanguage()
+ ->commaList( LanguageConverter::$languagesWithVariants );
+ },
+ $this
+ )
),
),
);
),
),
);