Skin::outputPage: Drop support for specifying a context, deprecated in 1.20

Bug: T220656
Change-Id: Ie416c88874599dbb196fc0e5abac711345c155a0

diff --git a/RELEASE-NOTES-1.34 b/RELEASE-NOTES-1.34
index f3baa52..5c0b57e 100644 (file)
--- a/RELEASE-NOTES-1.34
+++ b/RELEASE-NOTES-1.34
@@ -229,6 +229,7 @@ because of Phabricator reports.
   \Maintenance::countDown() method instead.
 * OutputPage::wrapWikiMsg() no longer accepts an options parameter. This was
   deprecated since 1.20.
+* Skin::outputPage() no longer accepts a context. This was deprecated in 1.20.
 * …
 
 === Deprecations in 1.34 ===

diff --git a/includes/skins/Skin.php b/includes/skins/Skin.php
index f45596f..05b6297 100644 (file)
--- a/includes/skins/Skin.php
+++ b/includes/skins/Skin.php
@@ -389,9 +389,8 @@ abstract class Skin extends ContextSource {
 
        /**
         * Outputs the HTML generated by other functions.
-        * @param OutputPage|null $out
         */
-       abstract function outputPage( OutputPage $out = null );
+       abstract function outputPage();
 
        /**
         * @param array $data

diff --git a/includes/skins/SkinTemplate.php b/includes/skins/SkinTemplate.php
index a7b7569..8b46ee9 100644 (file)
--- 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 );
-               }
        }
 
        /**