X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2FSkinTemplate.php;h=18e36ba426604a93a37e4981cce0693233b1bbdd;hb=eabfeda3bec5d8108bddf143cf677aa301d8073b;hp=da4c376aa7bbcc724791b6af092e4831b8e9bfb5;hpb=32234445e06df7ba8f7508b16feff0a58d346348;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index da4c376aa7..18e36ba426 100644
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -247,7 +247,6 @@ class SkinTemplate extends Skin {
 		}
 
 		$out = $this->getOutput();
-		$user = $this->getUser();
 
 		wfProfileIn( __METHOD__ . '-init' );
 		$this->initPage( $out );
@@ -272,10 +271,9 @@ class SkinTemplate extends Skin {
 	 * initialize various variables and generate the template
 	 *
 	 * @since 1.23
-	 * @param $out OutputPage
 	 * @return QuickTemplate the template to be executed by outputPage
 	 */
-	protected function prepareQuickTemplate( OutputPage $out = null ) {
+	protected function prepareQuickTemplate() {
 		global $wgContLang, $wgScript, $wgStylePath,
 			$wgMimeType, $wgJsMimeType, $wgXhtmlNamespaces, $wgHtml5Version,
 			$wgDisableCounters, $wgSitename, $wgLogo, $wgMaxCredits,
@@ -286,6 +284,7 @@ class SkinTemplate extends Skin {
 
 		$title = $this->getTitle();
 		$request = $this->getRequest();
+		$out = $this->getOutput();
 		$tpl = $this->setupTemplateForOutput();
 
 		wfProfileIn( __METHOD__ . '-stuff-head' );
@@ -1404,15 +1403,6 @@ abstract class QuickTemplate {
 		echo htmlspecialchars( $this->data[$str] );
 	}
 
-	/**
-	 * @private
-	 * @deprecated since 1.21; use Xml::encodeJsVar() or Xml::encodeJsCall() instead
-	 */
-	function jstext( $str ) {
-		wfDeprecated( __METHOD__, '1.21' );
-		echo Xml::escapeJsString( $this->data[$str] );
-	}
-
 	/**
 	 * @private
 	 */