jenkins-bot has submitted this change and it was merged.

Change subject: Use quickUserCan() in showHeader() to avoid master queries
......................................................................


Use quickUserCan() in showHeader() to avoid master queries

* This avoids master queries against the ipblocks table

Bug: T92357
Change-Id: I97c02932d76cea87600dd436e346dcf553706aad
---
M pages/TalkpageView.php
1 file changed, 3 insertions(+), 2 deletions(-)

Approvals:
  Gilles: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/pages/TalkpageView.php b/pages/TalkpageView.php
index 0bc7637..a1f8ddb 100644
--- a/pages/TalkpageView.php
+++ b/pages/TalkpageView.php
@@ -48,9 +48,10 @@
                        $article->view();
 
                        $actionLinks = array();
+                       $msgKey =  $article->getTitle()->quickUserCan( 'edit' ) 
? 'edit' : 'viewsource';
                        $actionLinks[] = Linker::link(
                                $article->getTitle(),
-                               wfMessage( $article->getTitle()->userCan( 
'edit' ) ? 'edit' : 'viewsource' )->parse() . "↑",
+                               wfMessage( $msgKey )->parse() . "↑",
                                array(),
                                array( 'action' => 'edit' )
                        );
@@ -81,7 +82,7 @@
                        $html = Xml::tags( 'div', array( 'class' => 
'lqt_header_content' ), $html );
 
                        $this->output->addHTML( $html );
-               } elseif ( $article->getTitle()->userCan( 'edit' ) ) {
+               } elseif ( $article->getTitle()->quickUserCan( 'edit' ) ) {
 
                        $editLink = Linker::link(
                                $this->talkpage->getTitle(),

-- 
To view, visit https://gerrit.wikimedia.org/r/234193
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I97c02932d76cea87600dd436e346dcf553706aad
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/LiquidThreads
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Gilles <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to