jenkins-bot has submitted this change and it was merged.
Change subject: Avoid DBPerformance log warnings due to isBlockedFrom()
......................................................................
Avoid DBPerformance log warnings due to isBlockedFrom()
Change-Id: I276656ab854d2566b81774360d2bf155fa609ae8
---
M ApiVisualEditor.php
1 file changed, 5 insertions(+), 2 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
Addshore: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/ApiVisualEditor.php b/ApiVisualEditor.php
index 9b07384..f59cdfa 100644
--- a/ApiVisualEditor.php
+++ b/ApiVisualEditor.php
@@ -487,7 +487,8 @@
$notices[] = "<div
class=\"mw-userpage-userdoesnotexist error\">\n" .
$this->msg(
'userpage-userdoesnotexist', wfEscapeWikiText( $targetUsername ) ) .
"\n</div>";
- } elseif ( $targetUser->isBlocked() ) {
// Show log extract if the user is currently blocked
+ } elseif ( $targetUser->isBlocked() ) {
+ // Show log extract if the user
is currently blocked
$notices[] = $this->msg(
'blocked-notice-logextract',
$targetUser->getName()
// Support GENDER in notice
@@ -496,7 +497,9 @@
}
// Blocked user notice
- if ( $user->isBlockedFrom( $title ) &&
$user->getBlock()->prevents( 'edit' ) !== false ) {
+ if ( $user->isBlockedFrom( $title, true )
+ && $user->getBlock()->prevents( 'edit'
) !== false
+ ) {
$notices[] = call_user_func_array(
[ $this, 'msg' ],
$user->getBlock()->getPermissionsError( $this->getContext() )
--
To view, visit https://gerrit.wikimedia.org/r/309245
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I276656ab854d2566b81774360d2bf155fa609ae8
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <asch...@wikimedia.org>
Gerrit-Reviewer: Addshore <addshorew...@gmail.com>
Gerrit-Reviewer: Catrope <roan.katt...@gmail.com>
Gerrit-Reviewer: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
