[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Avoid DBPerformance log warnings due to isBlockedFrom()

[jenkins-bot (Code Review)]

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[] = "\n" .
$this->msg( 
'userpage-userdoesnotexist', wfEscapeWikiText( $targetUsername ) ) .
"\n";
-   } 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 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Avoid DBPerformance log warnings due to isBlockedFrom()

[Aaron Schulz (Code Review)]

Aaron Schulz has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/309245

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(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/45/309245/1

diff --git a/ApiVisualEditor.php b/ApiVisualEditor.php
index 9b07384..f59cdfa 100644
--- a/ApiVisualEditor.php
+++ b/ApiVisualEditor.php
@@ -487,7 +487,8 @@
$notices[] = "\n" .
$this->msg( 
'userpage-userdoesnotexist', wfEscapeWikiText( $targetUsername ) ) .
"\n";
-   } 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: newchange
Gerrit-Change-Id: I276656ab854d2566b81774360d2bf155fa609ae8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits