From 85d097ba4ca6bf1a3ae15b21ca884cf4ed38907c Mon Sep 17 00:00:00 2001 From: Kunal Mehta Date: Sun, 18 Jan 2015 11:40:32 -0800 Subject: [PATCH] Simplify construction of SkinVector * Don't require a Config instance to be passed in the constructor, as that breaks skins that extend it. * Don't manually register the skin with SkinFactory, use $wgValidSkinNames Change-Id: Ie8539027c17caff35c1fc52a56676763df667fd9 --- SkinVector.php | 4 ++-- Vector.php | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/SkinVector.php b/SkinVector.php index c52a20bb..f5e3634c 100644 --- a/SkinVector.php +++ b/SkinVector.php @@ -35,8 +35,8 @@ class SkinVector extends SkinTemplate { */ private $vectorConfig; - public function __construct( Config $config ) { - $this->vectorConfig = $config; + public function __construct() { + $this->vectorConfig = ConfigFactory::getDefaultInstance()->makeConfig( 'vector' ); } /** diff --git a/Vector.php b/Vector.php index 4b7f95ea..2ffc3a7b 100644 --- a/Vector.php +++ b/Vector.php @@ -38,10 +38,7 @@ $GLOBALS['wgAutoloadClasses']['VectorTemplate'] = __DIR__ . '/VectorTemplate.php $GLOBALS['wgMessagesDirs']['Vector'] = __DIR__ . '/i18n'; // Register skin -SkinFactory::getDefaultInstance()->register( 'vector', 'Vector', function(){ - $config = ConfigFactory::getDefaultInstance()->makeConfig( 'vector' ); - return new SkinVector( $config ); -} ); +$GLOBALS['wgValidSkinNames']['vector'] = 'Vector'; // Register config $GLOBALS['wgConfigRegistry']['vector'] = 'GlobalVarConfig::newInstance';