From 222b01f5169f1c7e69762e0e8904c24f78f71882 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Wed, 28 Jul 2010 11:52:48 +0200
Subject: update to MediaWiki 1.16.0

---
 includes/parser/ParserOutput.php | 31 ++++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

(limited to 'includes/parser/ParserOutput.php')

diff --git a/includes/parser/ParserOutput.php b/includes/parser/ParserOutput.php
index 22c1dfba..ea5840e6 100644
--- a/includes/parser/ParserOutput.php
+++ b/includes/parser/ParserOutput.php
@@ -24,14 +24,10 @@ class ParserOutput
 		$mOutputHooks = array(),      # Hook tags as per $wgParserOutputHooks
 		$mWarnings = array(),         # Warning text to be returned to the user. Wikitext formatted, in the key only
 		$mSections = array(),         # Table of contents
-		$mProperties = array();       # Name/value pairs to be cached in the DB
+		$mProperties = array(),       # Name/value pairs to be cached in the DB
+		$mTOCHTML = '';	              # HTML of the TOC
 	private $mIndexPolicy = '';	      # 'index' or 'noindex'?  Any other value will result in no change.
 
-	/**
-	 * Overridden title for display
-	 */
-	private $displayTitle = false;
-
 	function ParserOutput( $text = '', $languageLinks = array(), $categoryLinks = array(),
 		$containsOldMagic = false, $titletext = '' )
 	{
@@ -54,10 +50,12 @@ class ParserOutput
 	function &getImages()                { return $this->mImages; }
 	function &getExternalLinks()         { return $this->mExternalLinks; }
 	function getNoGallery()              { return $this->mNoGallery; }
+	function getHeadItems()              { return $this->mHeadItems; }
 	function getSubtitle()               { return $this->mSubtitle; }
 	function getOutputHooks()            { return (array)$this->mOutputHooks; }
 	function getWarnings()               { return array_keys( $this->mWarnings ); }
 	function getIndexPolicy()            { return $this->mIndexPolicy; }
+	function getTOCHTML()                { return $this->mTOCHTML; }
 
 	function containsOldMagic()          { return $this->mContainsOldMagic; }
 	function setText( $text )            { return wfSetVar( $this->mText, $text ); }
@@ -68,10 +66,10 @@ class ParserOutput
 	function setTitleText( $t )          { return wfSetVar( $this->mTitleText, $t ); }
 	function setSections( $toc )         { return wfSetVar( $this->mSections, $toc ); }
 	function setIndexPolicy( $policy )   { return wfSetVar( $this->mIndexPolicy, $policy ); }
+	function setTOCHTML( $tochtml )      { return wfSetVar( $this->mTOCHTML, $tochtml ); }
 
 	function addCategory( $c, $sort )    { $this->mCategories[$c] = $sort; }
 	function addLanguageLink( $t )       { $this->mLanguageLinks[] = $t; }
-	function addExternalLink( $url )     { $this->mExternalLinks[$url] = 1; }
 	function addWarning( $s )            { $this->mWarnings[$s] = 1; }
 
 	function addOutputHook( $hook, $data = false ) {
@@ -91,7 +89,18 @@ class ParserOutput
 		return (bool)$this->mNewSection;
 	}
 
+	function addExternalLink( $url ) {
+		# We don't register links pointing to our own server, unless... :-)
+		global $wgServer, $wgRegisterInternalExternals;
+		if( $wgRegisterInternalExternals or stripos($url,$wgServer.'/')!==0)
+			$this->mExternalLinks[$url] = 1; 
+	}
+
 	function addLink( $title, $id = null ) {
+		if ( $title->isExternal() ) {
+			// Don't record interwikis in pagelinks
+			return;
+		}
 		$ns = $title->getNamespace();
 		$dbk = $title->getDBkey();
 		if ( $ns == NS_MEDIA ) {
@@ -170,7 +179,7 @@ class ParserOutput
 	 * @param string $text Desired title text
 	 */
 	public function setDisplayTitle( $text ) {
-		$this->displayTitle = $text;
+		$this->setTitleText( $text );
 	}
 
 	/**
@@ -179,7 +188,11 @@ class ParserOutput
 	 * @return string
 	 */
 	public function getDisplayTitle() {
-		return $this->displayTitle;
+		$t = $this->getTitleText( );
+		if( $t === '' ) {
+			return false;
+		}
+		return $t;
 	}
 
 	/**
-- 
cgit v1.2.2