X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fskins%2FSkinTemplate.php;h=5d6197e7ac70d05882a6f7fafb1facb94a552937;hb=01acafb746adbf4498e696b7f44c996bb350c0c5;hp=a7b7569f0e10c1d761ebf2ace800ee2c5f5ed35b;hpb=a891b8643c35ffacfda59d9208778195c39c3d9b;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/skins/SkinTemplate.php b/includes/skins/SkinTemplate.php
index a7b7569f0e..5d6197e7ac 100644
--- a/includes/skins/SkinTemplate.php
+++ b/includes/skins/SkinTemplate.php
@@ -207,21 +207,10 @@ class SkinTemplate extends Skin {
 	}
 
 	/**
-	 * initialize various variables and generate the template
-	 *
-	 * @param OutputPage|null $out
+	 * Initialize various variables and generate the template
 	 */
-	function outputPage( OutputPage $out = null ) {
+	function outputPage() {
 		Profiler::instance()->setTemplated( true );
-
-		$oldContext = null;
-		if ( $out !== null ) {
-			// Deprecated since 1.20, note added in 1.25
-			wfDeprecated( __METHOD__, '1.25' );
-			$oldContext = $this->getContext();
-			$this->setContext( $out->getContext() );
-		}
-
 		$out = $this->getOutput();
 
 		$this->initPage( $out );
@@ -231,10 +220,6 @@ class SkinTemplate extends Skin {
 
 		// result may be an error
 		$this->printOrError( $res );
-
-		if ( $oldContext ) {
-			$this->setContext( $oldContext );
-		}
 	}
 
 	/**
@@ -332,7 +317,7 @@ class SkinTemplate extends Skin {
 		$tpl->set( 'handheld', $request->getBool( 'handheld' ) );
 		$tpl->set( 'loggedin', $this->loggedin );
 		$tpl->set( 'notspecialpage', !$title->isSpecialPage() );
-		$tpl->set( 'searchaction', $this->escapeSearchLink() );
+		$tpl->set( 'searchaction', $this->getSearchLink() );
 		$tpl->set( 'searchtitle', SpecialPage::getTitleFor( 'Search' )->getPrefixedDBkey() );
 		$tpl->set( 'search', trim( $request->getVal( 'search' ) ) );
 		$tpl->set( 'stylepath', $wgStylePath );