From: Roan Kattouw <catrope@users.mediawiki.org>
Date: Fri, 10 Dec 2010 10:55:41 +0000 (+0000)
Subject: Fix regression in r78117 per CR, was causing read, edit and history tabs to disappear... 
X-Git-Tag: 1.31.0-rc.0~33402
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=927bba6f65fccf561f2a6b136610ada183e7e410;p=lhc%2Fweb%2Fwiklou.git

Fix regression in r78117 per CR, was causing read, edit and history tabs to disappear for users who couldn't edit due to $wgEmailConfirmToEdit or $wgNamespaceProtection
---

diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index 313225d568..7821a58a00 100644
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -728,7 +728,7 @@ class SkinTemplate extends Skin {
 		$action = $wgRequest->getVal( 'action', 'view' );
 		$section = $wgRequest->getVal( 'section' );
 		$content_actions = array();
-		$userCanRead = $this->mTitle->quickUserCan( 'read' );
+		$userCanRead = $this->mTitle->userCanRead();
 
 		$prevent_active_tabs = false;
 		wfRunHooks( 'SkinTemplatePreventOtherActiveTabs', array( &$this, &$prevent_active_tabs ) );
diff --git a/skins/Vector.php b/skins/Vector.php
index 6ee6897e8e..27fb9e858f 100644
--- a/skins/Vector.php
+++ b/skins/Vector.php
@@ -73,7 +73,7 @@ class SkinVector extends SkinTemplate {
 		$action = $wgRequest->getVal( 'action', 'view' );
 		$section = $wgRequest->getVal( 'section' );
 
-		$userCanRead = $this->mTitle->quickUserCan( 'read' );
+		$userCanRead = $this->mTitle->userCanRead();
 
 		// Checks if page is some kind of content
 		if( $this->iscontent ) {