Use standard function name for constructor.

Also remove a redundant constant check.

Change-Id: I55d929e6bc8f8a851bedf5eaa476601af4458e6e

diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index bda4395..dfd7dca 100644 (file)
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -1225,7 +1225,7 @@ abstract class QuickTemplate {
        /**
         * Constructor
         */
-       public function QuickTemplate() {
+       function __construct() {
                $this->data = array();
                $this->translator = new MediaWiki_I18N();
        }

diff --git a/includes/templates/Userlogin.php b/includes/templates/Userlogin.php
index a3f6a38..182992a 100644 (file)
--- a/includes/templates/Userlogin.php
+++ b/includes/templates/Userlogin.php
@@ -25,8 +25,6 @@
  * @defgroup Templates Templates
  */
 
-if( !defined( 'MEDIAWIKI' ) ) die( -1 );
-
 /**
  * HTML template for Special:Userlogin form
  * @ingroup Templates