golem
/
VectorGOLEM
9
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

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
This commit is contained in:
Kunal Mehta 2015-01-18 11:40:32 -08:00
parent e3d66a7d38
commit 85d097ba4c
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SkinVector.php
View File

@ -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' );
}
/**

5
Vector.php
View File

@ -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';