Merge "Set 'skin' template parameter rather than override parent method"

diff --git a/includes/specials/SpecialUserlogin.php b/includes/specials/SpecialUserlogin.php
index e0ddc96..c3a954f 100644 (file)
--- a/includes/specials/SpecialUserlogin.php
+++ b/includes/specials/SpecialUserlogin.php
@@ -1131,6 +1131,7 @@ class LoginForm extends SpecialPage {
                        : is_array( $wgPasswordResetRoutes ) && in_array( true, array_values( $wgPasswordResetRoutes ) );
 
                $template->set( 'header', '' );
+               $template->set( 'skin', $this->getSkin() );
                $template->set( 'name', $this->mUsername );
                $template->set( 'password', $this->mPassword );
                $template->set( 'retype', $this->mRetype );

diff --git a/includes/templates/UserloginVForm.php b/includes/templates/UserloginVForm.php
index 132a7c1..2e90c09 100644 (file)
--- a/includes/templates/UserloginVForm.php
+++ b/includes/templates/UserloginVForm.php
@@ -25,17 +25,6 @@
  */
 class UserloginTemplateVForm extends BaseTemplate {
 
-       /**
-        * Get the Skin object related to this object, so that BaseTemplate msg 31
-        * methods work.
-        *
-        * @return Skin object
-        */
-       public function getSkin() {
-               global $wgOut;
-               return $wgOut->getSkin();
-       }
-
        function execute() {
                global $wgCookieExpiration;
                $expirationDays = ceil( $wgCookieExpiration / ( 3600 * 24 ) );