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 "Integrate module 'jquery.checkboxShiftClick' into 'mediawiki.page.ready'"
[lhc/web/wiklou.git]
/
includes
/
logging
/
LogPager.php
diff --git
a/includes/logging/LogPager.php
b/includes/logging/LogPager.php
index
3871047
..
5e9fdb8
100644
(file)
--- a/
includes/logging/LogPager.php
+++ b/
includes/logging/LogPager.php
@@
-53,6
+53,12
@@
class LogPager extends ReverseChronologicalPager {
/** @var bool */
private $actionRestrictionsEnforced = false;
/** @var bool */
private $actionRestrictionsEnforced = false;
+ /** @var array */
+ private $mConds;
+
+ /** @var string */
+ private $mTagFilter;
+
/** @var LogEventsList */
public $mLogEventsList;
/** @var LogEventsList */
public $mLogEventsList;
@@
-146,7
+152,9
@@
class LogPager extends ReverseChronologicalPager {
$needReindex = false;
foreach ( $types as $type ) {
if ( isset( $wgLogRestrictions[$type] )
$needReindex = false;
foreach ( $types as $type ) {
if ( isset( $wgLogRestrictions[$type] )
- && !$user->isAllowed( $wgLogRestrictions[$type] )
+ && !MediaWikiServices::getInstance()
+ ->getPermissionManager()
+ ->userHasRight( $user, $wgLogRestrictions[$type] )
) {
$needReindex = true;
$types = array_diff( $types, [ $type ] );
) {
$needReindex = true;
$types = array_diff( $types, [ $type ] );
@@
-462,12
+470,10
@@
class LogPager extends ReverseChronologicalPager {
}
$this->actionRestrictionsEnforced = true;
$user = $this->getUser();
}
$this->actionRestrictionsEnforced = true;
$user = $this->getUser();
- if ( !$user->isAllowed( 'deletedhistory' ) ) {
+ $permissionManager = MediaWikiServices::getInstance()->getPermissionManager();
+ if ( !$permissionManager->userHasRight( $user, 'deletedhistory' ) ) {
$this->mConds[] = $this->mDb->bitAnd( 'log_deleted', LogPage::DELETED_ACTION ) . ' = 0';
$this->mConds[] = $this->mDb->bitAnd( 'log_deleted', LogPage::DELETED_ACTION ) . ' = 0';
- } elseif ( !MediaWikiServices::getInstance()
- ->getPermissionManager()
- ->userHasAnyRight( $user, 'suppressrevision', 'viewsuppressed' )
- ) {
+ } elseif ( !$permissionManager->userHasAnyRight( $user, 'suppressrevision', 'viewsuppressed' ) ) {
$this->mConds[] = $this->mDb->bitAnd( 'log_deleted', LogPage::SUPPRESSED_ACTION ) .
' != ' . LogPage::SUPPRESSED_USER;
}
$this->mConds[] = $this->mDb->bitAnd( 'log_deleted', LogPage::SUPPRESSED_ACTION ) .
' != ' . LogPage::SUPPRESSED_USER;
}
@@
-483,12
+489,10
@@
class LogPager extends ReverseChronologicalPager {
}
$this->performerRestrictionsEnforced = true;
$user = $this->getUser();
}
$this->performerRestrictionsEnforced = true;
$user = $this->getUser();
- if ( !$user->isAllowed( 'deletedhistory' ) ) {
+ $permissionManager = MediaWikiServices::getInstance()->getPermissionManager();
+ if ( !$permissionManager->userHasRight( $user, 'deletedhistory' ) ) {
$this->mConds[] = $this->mDb->bitAnd( 'log_deleted', LogPage::DELETED_USER ) . ' = 0';
$this->mConds[] = $this->mDb->bitAnd( 'log_deleted', LogPage::DELETED_USER ) . ' = 0';
- } elseif ( !MediaWikiServices::getInstance()
- ->getPermissionManager()
- ->userHasAnyRight( $user, 'suppressrevision', 'viewsuppressed' )
- ) {
+ } elseif ( !$permissionManager->userHasAnyRight( $user, 'suppressrevision', 'viewsuppressed' ) ) {
$this->mConds[] = $this->mDb->bitAnd( 'log_deleted', LogPage::SUPPRESSED_USER ) .
' != ' . LogPage::SUPPRESSED_ACTION;
}
$this->mConds[] = $this->mDb->bitAnd( 'log_deleted', LogPage::SUPPRESSED_USER ) .
' != ' . LogPage::SUPPRESSED_ACTION;
}