From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Thu, 31 Jan 2019 01:38:43 +0000 (+0000)
Subject: Merge "Avoid making master connection from Skin::getUndeleteLink"
X-Git-Tag: 1.34.0-rc.0~2981
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/membres/fiche.php?a=commitdiff_plain;h=0e9d4e9c78b1a84f09702b67f082a6688db845f2;hp=1e07d4cd636b69cdd30a789f5425d6356a356679;p=lhc%2Fweb%2Fwiklou.git

Merge "Avoid making master connection from Skin::getUndeleteLink"
---

diff --git a/includes/skins/Skin.php b/includes/skins/Skin.php
index 7a2679e4c8..54dfff30bd 100644
--- a/includes/skins/Skin.php
+++ b/includes/skins/Skin.php
@@ -719,7 +719,7 @@ abstract class Skin extends ContextSource {
 		$title = $this->getTitle();
 
 		if ( ( !$title->exists() || $action == 'history' ) &&
-			$title->userCan( 'deletedhistory', $this->getUser() )
+			$title->quickUserCan( 'deletedhistory', $this->getUser() )
 		) {
 			$n = $title->isDeleted();