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 "Selenium: replace UserLoginPage with BlankPage where possible"
[lhc/web/wiklou.git]
/
includes
/
api
/
ApiQueryInfo.php
diff --git
a/includes/api/ApiQueryInfo.php
b/includes/api/ApiQueryInfo.php
index
a5437ba
..
90f1340
100644
(file)
--- a/
includes/api/ApiQueryInfo.php
+++ b/
includes/api/ApiQueryInfo.php
@@
-409,6
+409,8
@@
class ApiQueryInfo extends ApiQueryBase {
$pageInfo['pagelanguagehtmlcode'] = $pageLanguage->getHtmlCode();
$pageInfo['pagelanguagedir'] = $pageLanguage->getDir();
$pageInfo['pagelanguagehtmlcode'] = $pageLanguage->getHtmlCode();
$pageInfo['pagelanguagedir'] = $pageLanguage->getDir();
+ $user = $this->getUser();
+
if ( $titleExists ) {
$pageInfo['touched'] = wfTimestamp( TS_ISO_8601, $this->pageTouched[$pageid] );
$pageInfo['lastrevid'] = (int)$this->pageLatest[$pageid];
if ( $titleExists ) {
$pageInfo['touched'] = wfTimestamp( TS_ISO_8601, $this->pageTouched[$pageid] );
$pageInfo['lastrevid'] = (int)$this->pageLatest[$pageid];
@@
-493,7
+495,9
@@
class ApiQueryInfo extends ApiQueryBase {
$pageInfo['canonicalurl'] = wfExpandUrl( $title->getFullURL(), PROTO_CANONICAL );
}
if ( $this->fld_readable ) {
$pageInfo['canonicalurl'] = wfExpandUrl( $title->getFullURL(), PROTO_CANONICAL );
}
if ( $this->fld_readable ) {
- $pageInfo['readable'] = $title->userCan( 'read', $this->getUser() );
+ $pageInfo['readable'] = $this->getPermissionManager()->userCan(
+ 'read', $user, $title
+ );
}
if ( $this->fld_preload ) {
}
if ( $this->fld_preload ) {
@@
-539,10
+543,14
@@
class ApiQueryInfo extends ApiQueryBase {
$this->countTestedActions++;
if ( $detailLevel === 'boolean' ) {
$this->countTestedActions++;
if ( $detailLevel === 'boolean' ) {
- $pageInfo['actions'][$action] = $title->userCan( $action, $user );
+ $pageInfo['actions'][$action] = $this->getPermissionManager()->userCan(
+ $action, $user, $title
+ );
} else {
$pageInfo['actions'][$action] = $errorFormatter->arrayFromStatus( $this->errorArrayToStatus(
} else {
$pageInfo['actions'][$action] = $errorFormatter->arrayFromStatus( $this->errorArrayToStatus(
- $title->getUserPermissionsErrors( $action, $user, $rigor ),
+ $this->getPermissionManager()->getPermissionErrors(
+ $action, $user, $title, $rigor
+ ),
$user
) );
}
$user
) );
}
@@
-708,10
+716,11
@@
class ApiQueryInfo extends ApiQueryBase {
*/
private function getTSIDs() {
$getTitles = $this->talkids = $this->subjectids = [];
*/
private function getTSIDs() {
$getTitles = $this->talkids = $this->subjectids = [];
+ $nsInfo = MediaWikiServices::getInstance()->getNamespaceInfo();
/** @var Title $t */
foreach ( $this->everything as $t ) {
/** @var Title $t */
foreach ( $this->everything as $t ) {
- if (
MWNamespace::
isTalk( $t->getNamespace() ) ) {
+ if (
$nsInfo->
isTalk( $t->getNamespace() ) ) {
if ( $this->fld_subjectid ) {
$getTitles[] = $t->getSubjectPage();
}
if ( $this->fld_subjectid ) {
$getTitles[] = $t->getSubjectPage();
}
@@
-734,12
+743,12
@@
class ApiQueryInfo extends ApiQueryBase {
$this->addWhere( $lb->constructSet( 'page', $db ) );
$res = $this->select( __METHOD__ );
foreach ( $res as $row ) {
$this->addWhere( $lb->constructSet( 'page', $db ) );
$res = $this->select( __METHOD__ );
foreach ( $res as $row ) {
- if (
MWNamespace::
isTalk( $row->page_namespace ) ) {
- $this->talkids[
MWNamespace::
getSubject( $row->page_namespace )][$row->page_title] =
- (int)
$row->page_id
;
+ if (
$nsInfo->
isTalk( $row->page_namespace ) ) {
+ $this->talkids[
$nsInfo->
getSubject( $row->page_namespace )][$row->page_title] =
+ (int)
( $row->page_id )
;
} else {
} else {
- $this->subjectids[
MWNamespace::
getTalk( $row->page_namespace )][$row->page_title] =
- (int)
$row->page_id
;
+ $this->subjectids[
$nsInfo->
getTalk( $row->page_namespace )][$row->page_title] =
+ (int)
( $row->page_id )
;
}
}
}
}
}
}