From 03fb770cfb2335763bb3fb19a66f21c2ae7252af Mon Sep 17 00:00:00 2001
From: Rob Church <robchurch@users.mediawiki.org>
Date: Sun, 14 May 2006 21:52:28 +0000
Subject: [PATCH] Revert; not cache-safe

---
 RELEASE-NOTES       |  1 -
 includes/Parser.php | 17 ++++++-----------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 0114d679b2..e153091aef 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -266,7 +266,6 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   Special:Statistics
 * (bug 5949) Update to Indonesian localisation (id)
 * (bug 5862) Update of Belarusian translation (be)
-* (bug 5651) Disable section editing links for users who can't edit
 * (bug 5950) Improvements to French localisation
 * (bug 5805) {{plural:}} support for counters in some special pages
 * (bug 5952) Improvement to German localisation (de)
diff --git a/includes/Parser.php b/includes/Parser.php
index b8633a7990..d2700c9574 100644
--- a/includes/Parser.php
+++ b/includes/Parser.php
@@ -3054,13 +3054,11 @@ class Parser
 		$doNumberHeadings = $this->mOptions->getNumberHeadings();
 		$doShowToc = true;
 		$forceTocHere = false;
-		
-		# Show section editing links if the user can edit the page and has
-		# the appropriate preference set
-		$user =& $this->mOptions->getUser();
-		$perm = $user->isAllowed( 'edit' ) && $this->mTitle->userCanEdit();
-		$pref = $this->mOptions->getEditSection();
-		$showEditLink = $perm && $pref;
+		if( !$this->mTitle->userCanEdit() ) {
+			$showEditLink = 0;
+		} else {
+			$showEditLink = $this->mOptions->getEditSection();
+		}
 
 		# Inhibit editsection links if requested in the page
 		$esw =& MagicWord::get( MAG_NOEDITSECTION );
@@ -4221,7 +4219,6 @@ class ParserOptions
 	var $mAllowSpecialInclusion;     # Allow inclusion of special pages
 	var $mTidy;                      # Ask for tidy cleanup
 	var $mInterfaceMessage;          # Which lang to call for PLURAL and GRAMMAR
-	var $mUser;						 # User being parsed for
 
 	function getUseTeX()                        { return $this->mUseTeX; }
 	function getUseDynamicDates()               { return $this->mUseDynamicDates; }
@@ -4235,7 +4232,6 @@ class ParserOptions
 	function getAllowSpecialInclusion()         { return $this->mAllowSpecialInclusion; }
 	function getTidy()                          { return $this->mTidy; }
 	function getInterfaceMessage()              { return $this->mInterfaceMessage; }
-	function getUser()							{ return $this->mUser; }
 
 	function setUseTeX( $x )                    { return wfSetVar( $this->mUseTeX, $x ); }
 	function setUseDynamicDates( $x )           { return wfSetVar( $this->mUseDynamicDates, $x ); }
@@ -4278,7 +4274,6 @@ class ParserOptions
 			$user =& $userInput;
 		}
 
-		$this->mUser =& $user;
 		$this->mUseTeX = $wgUseTeX;
 		$this->mUseDynamicDates = $wgUseDynamicDates;
 		$this->mInterwikiMagic = $wgInterwikiMagic;
@@ -4288,7 +4283,7 @@ class ParserOptions
 		$this->mSkin =& $user->getSkin();
 		wfProfileOut( $fname.'-skin' );
 		$this->mDateFormat = $user->getOption( 'date' );
-		$this->mEditSection = $user->getOption( 'editsection' );
+		$this->mEditSection = true;
 		$this->mNumberHeadings = $user->getOption( 'numberheadings' );
 		$this->mAllowSpecialInclusion = $wgAllowSpecialInclusion;
 		$this->mTidy = false;
-- 
2.20.1