From: withoutaname <drevitchi@gmail.com>
Date: Wed, 16 Jul 2014 18:14:52 +0000 (-0700)
Subject: Removed request() and output() from class "MediaWiki"
X-Git-Tag: 1.31.0-rc.0~14196
X-Git-Url: https://git.cyclocoop.org/%27.%24link.%27?a=commitdiff_plain;h=b7fce5bc0638aa95b6c15ef891e0a6ca4ac8dbc2;p=lhc%2Fweb%2Fwiklou.git

Removed request() and output() from class "MediaWiki"

Also removed the todo, as the folding was done years ago.

Change-Id: I4953ec3ca650bab9154c07a3a73f1f6ca4ee071e
---

diff --git a/includes/MediaWiki.php b/includes/MediaWiki.php
index 0424633a93..9213c021ef 100644
--- a/includes/MediaWiki.php
+++ b/includes/MediaWiki.php
@@ -27,7 +27,6 @@
  */
 class MediaWiki {
 	/**
-	 * @todo Fold $output, etc, into this
 	 * @var IContextSource
 	 */
 	private $context;
@@ -37,30 +36,6 @@ class MediaWiki {
 	 */
 	private $config;
 
-	/**
-	 * @param null|WebRequest $x
-	 * @return WebRequest
-	 */
-	public function request( WebRequest $x = null ) {
-		$old = $this->context->getRequest();
-		if ( $x ) {
-			$this->context->setRequest( $x );
-		}
-		return $old;
-	}
-
-	/**
-	 * @param null|OutputPage $x
-	 * @return OutputPage
-	 */
-	public function output( OutputPage $x = null ) {
-		$old = $this->context->getOutput();
-		if ( $x ) {
-			$this->context->setOutput( $x );
-		}
-		return $old;
-	}
-
 	/**
 	 * @param IContextSource|null $context
 	 */