Hoo man has uploaded a new change for review.
https://gerrit.wikimedia.org/r/181877
Change subject: EditPage: Don't claim we're readonly just because $wgUser can't
edit
......................................................................
EditPage: Don't claim we're readonly just because $wgUser can't edit
Attempt at T85342, untested.
Bug: T85342
Change-Id: Ia5a4e26bfeab98560322247e82603bec5ec30c44
---
M includes/EditPage.php
1 file changed, 14 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/77/181877/1
diff --git a/includes/EditPage.php b/includes/EditPage.php
index 7f5a9c0..0f7afa6 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -1666,15 +1666,27 @@
return $status;
}
+ if ( wfReadOnly() ) {
+ $status->fatal( 'readonlytext' );
+ $status->value = self::AS_READ_ONLY_PAGE;
+ wfProfileOut( __METHOD__ . '-checks' );
+ wfProfileOut( __METHOD__ );
+ return $status;
+ }
+
if ( !$wgUser->isAllowed( 'edit' ) ) {
+ if ( User::isEveryoneAllowed( 'edit' ) ) {
+ // Potentially T85342
+ wfWarn( '$wgUser is not allowed to edit,
although everyone is.' );
+ }
+
if ( $wgUser->isAnon() ) {
$status->setResult( false,
self::AS_READ_ONLY_PAGE_ANON );
wfProfileOut( __METHOD__ . '-checks' );
wfProfileOut( __METHOD__ );
return $status;
} else {
- $status->fatal( 'readonlytext' );
- $status->value = self::AS_READ_ONLY_PAGE_LOGGED;
+ $status->setResult( false,
self::AS_READ_ONLY_PAGE_LOGGED );
wfProfileOut( __METHOD__ . '-checks' );
wfProfileOut( __METHOD__ );
return $status;
@@ -1690,13 +1702,6 @@
return $status;
}
- if ( wfReadOnly() ) {
- $status->fatal( 'readonlytext' );
- $status->value = self::AS_READ_ONLY_PAGE;
- wfProfileOut( __METHOD__ . '-checks' );
- wfProfileOut( __METHOD__ );
- return $status;
- }
if ( $wgUser->pingLimiter() || $wgUser->pingLimiter(
'linkpurge', 0 ) ) {
$status->fatal( 'actionthrottledtext' );
$status->value = self::AS_RATE_LIMITED;
--
To view, visit https://gerrit.wikimedia.org/r/181877
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia5a4e26bfeab98560322247e82603bec5ec30c44
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Hoo man <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
