X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FOutputPage.php;h=97165b46130401a79695f4333d9fbaaa030da419;hb=01caf147b66d00c861e320ab88c7958f4376db8b;hp=3e0564b744346636671693272911930ee0ee941a;hpb=765829b6506ee32e06e1c070d2af2d427c989f5c;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 3e0564b744..97165b4613 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -229,9 +229,6 @@ class OutputPage extends ContextSource {
 	/** @var string */
 	private $mPageTitleActionText = '';
 
-	/** @var array */
-	private $mParseWarnings = array();
-
 	/** @var int Cache stuff. Looks like mEnableClientCache */
 	protected $mCdnMaxage = 0;
 	/** @var int Upper limit on mCdnMaxage */
@@ -1773,7 +1770,6 @@ class OutputPage extends ContextSource {
 		$this->mNewSectionLink = $parserOutput->getNewSection();
 		$this->mHideNewSectionLink = $parserOutput->getHideNewSection();
 
-		$this->mParseWarnings = $parserOutput->getWarnings();
 		if ( !$parserOutput->isCacheable() ) {
 			$this->enableClientCache( false );
 		}
@@ -2338,15 +2334,6 @@ class OutputPage extends ContextSource {
 		print $ins;
 	}
 
-	/**
-	 * Produce a "user is blocked" page.
-	 * @deprecated since 1.18
-	 */
-	function blockedPage() {
-		wfDeprecated( __METHOD__, '1.18' );
-		throw new UserBlockedError( $this->getUser()->mBlock );
-	}
-
 	/**
 	 * Prepare this object to display an error page; disable caching and
 	 * indexing, clear the current text and redirect, set the page's title
@@ -2488,17 +2475,6 @@ class OutputPage extends ContextSource {
 		$this->returnToMain();
 	}
 
-	/**
-	 * Display an error page noting that a given permission bit is required.
-	 * @deprecated since 1.18, just throw the exception directly
-	 * @param string $permission Key required
-	 * @throws PermissionsError
-	 */
-	public function permissionRequired( $permission ) {
-		wfDeprecated( __METHOD__, '1.18' );
-		throw new PermissionsError( $permission );
-	}
-
 	/**
 	 * Format a list of error messages
 	 *
@@ -3953,20 +3929,6 @@ class OutputPage extends ContextSource {
 		$this->addWikiText( $s );
 	}
 
-	/**
-	 * Include jQuery core. Use this to avoid loading it multiple times
-	 * before we get a usable script loader.
-	 *
-	 * @param array $modules List of jQuery modules which should be loaded
-	 * @return array The list of modules which were not loaded.
-	 * @since 1.16
-	 * @deprecated since 1.17
-	 */
-	public function includeJQuery( array $modules = array() ) {
-		wfDeprecated( __METHOD__, '1.17' );
-		return array();
-	}
-
 	/**
 	 * Enables/disables TOC, doesn't override __NOTOC__
 	 * @param bool $flag