From a04b5d5dcb1cef9cff45170b3eee6651337678be Mon Sep 17 00:00:00 2001
From: Brad Jorsch <bjorsch@wikimedia.org>
Date: Fri, 22 Nov 2013 08:51:11 -0500
Subject: [PATCH] Revert "Suppress section edit links with action=render"

This reverts commit 2248021997324c8694430a3c010b8b81482be0c3.

That revision caused section edit links to be shown on views of old
revisions. See comments there for suggestions on reimplementing it.

Change-Id: Ie65e3de84b44866e4ab1fc222a365cb3a9180ee1
---
 RELEASE-NOTES-1.23      |  4 ----
 includes/Article.php    |  1 -
 includes/OutputPage.php | 25 +------------------------
 3 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/RELEASE-NOTES-1.23 b/RELEASE-NOTES-1.23
index 89b27ad06f..caa4e7c888 100644
--- a/RELEASE-NOTES-1.23
+++ b/RELEASE-NOTES-1.23
@@ -49,10 +49,6 @@ production.
   when the email address is already confirmed. Also, consistently use
   "confirmed", rather than "authenticated", when messaging whether or not the
   user has confirmed an email address.
-* (bug 19415) action=render no longer shows section edit links. This affects
-  behavior of several other features where (bogus) section edit links will
-  disappear, such as file description pages loaded via $wgUseInstantCommons or
-  pages transcluded cross-wiki via $wgEnableScaryTranscluding.
 * (bug 56912) Show correct link color on cached result of Special:DeadendPages.
 * Classes TitleListDependency and TitleDependency have been removed, as they
   have been found unused in core and extensions for a long time.
diff --git a/includes/Article.php b/includes/Article.php
index 854f7f1113..ecbc59fa53 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -1478,7 +1478,6 @@ class Article implements Page {
 	 */
 	public function render() {
 		$this->getContext()->getOutput()->setArticleBodyOnly( true );
-		$this->getContext()->getOutput()->enableSectionEditLinks( false );
 		$this->view();
 	}
 
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 638887b2aa..2c4c64ee11 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -256,15 +256,10 @@ class OutputPage extends ContextSource {
 	private $mTarget = null;
 
 	/**
-	 * @var bool: Whether parser output should contain table of contents
+	 * @var bool: Whether output should contain table of contents
 	 */
 	private $mEnableTOC = true;
 
-	/**
-	 * @var bool: Whether parser output should contain section edit links
-	 */
-	private $mEnableSectionEditLinks = true;
-
 	/**
 	 * Constructor for OutputPage. This should not be called directly.
 	 * Instead a new RequestContext should be created and it will implicitly create
@@ -1617,7 +1612,6 @@ class OutputPage extends ContextSource {
 	function addParserOutput( &$parserOutput ) {
 		$this->addParserOutputNoText( $parserOutput );
 		$parserOutput->setTOCEnabled( $this->mEnableTOC );
-		$parserOutput->setEditSectionTokens( $this->mEnableSectionEditLinks );
 		$text = $parserOutput->getText();
 		wfRunHooks( 'OutputPageBeforeHTML', array( &$this, &$text ) );
 		$this->addHTML( $text );
@@ -3678,21 +3672,4 @@ $templates
 	public function isTOCEnabled() {
 		return $this->mEnableTOC;
 	}
-
-	/**
-	 * Enables/disables section edit links, doesn't override __NOEDITSECTION__
-	 * @param bool $flag
-	 * @since 1.23
-	 */
-	public function enableSectionEditLinks( $flag = true ) {
-		$this->mEnableSectionEditLinks = $flag;
-	}
-
-	/**
-	 * @return bool
-	 * @since 1.23
-	 */
-	public function sectionEditLinksEnabled() {
-		return $this->mEnableSectionEditLinks;
-	}
 }
-- 
2.20.1