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 "Fix permission check on protection log"
[lhc/web/wiklou.git]
/
includes
/
Revision
/
RevisionRecord.php
diff --git
a/includes/Revision/RevisionRecord.php
b/includes/Revision/RevisionRecord.php
index
ff9ac57
..
cf35371
100644
(file)
--- a/
includes/Revision/RevisionRecord.php
+++ b/
includes/Revision/RevisionRecord.php
@@
-59,7
+59,7
@@
abstract class RevisionRecord {
const FOR_THIS_USER = 2;
const RAW = 3;
const FOR_THIS_USER = 2;
const RAW = 3;
- /** @var string Wiki ID; false means the current wiki */
+ /** @var string
|false
Wiki ID; false means the current wiki */
protected $mWiki = false;
/** @var int|null */
protected $mId;
protected $mWiki = false;
/** @var int|null */
protected $mId;
@@
-531,8
+531,6
@@
abstract class RevisionRecord {
$text = $title->getPrefixedText();
wfDebug( "Checking for $permissionlist on $text due to $field match on $bitfield\n" );
$text = $title->getPrefixedText();
wfDebug( "Checking for $permissionlist on $text due to $field match on $bitfield\n" );
- $permissionManager = MediaWikiServices::getInstance()->getPermissionManager();
-
foreach ( $permissions as $perm ) {
if ( $permissionManager->userCan( $perm, $user, $title ) ) {
return true;
foreach ( $permissions as $perm ) {
if ( $permissionManager->userCan( $perm, $user, $title ) ) {
return true;