Merge "Move class_alias out of skin initialization"

This commit is contained in:
jenkins-bot 2017-11-08 06:46:20 +00:00 committed by Gerrit Code Review
commit 9fa40f81d8
3 changed files with 4 additions and 5 deletions

View file

@ -34,11 +34,6 @@ class MinervaHooks {
// Set LESS importpath // Set LESS importpath
global $wgResourceLoaderLESSImportPaths; global $wgResourceLoaderLESSImportPaths;
$wgResourceLoaderLESSImportPaths[] = dirname( __DIR__ ) . "/minerva.less/"; $wgResourceLoaderLESSImportPaths[] = dirname( __DIR__ ) . "/minerva.less/";
// Setup alias for compatibility with SkinMinervaNeue.
if ( !class_exists( 'SkinMinervaNeue' ) ) {
class_alias( 'SkinMinerva', 'SkinMinervaNeue', true );
}
} }
/** /**

View file

@ -1430,3 +1430,6 @@ class SkinMinerva extends SkinTemplate implements ICustomizableSkin {
$out->addModuleStyles( $this->getSkinStyles() ); $out->addModuleStyles( $this->getSkinStyles() );
} }
} }
// Setup alias for compatibility with SkinMinervaNeue.
class_alias( 'SkinMinerva', 'SkinMinervaNeue' );

View file

@ -5,6 +5,7 @@
"MinervaHooks": "includes/Minerva.hooks.php", "MinervaHooks": "includes/Minerva.hooks.php",
"MinervaTemplate": "includes/skins/MinervaTemplate.php", "MinervaTemplate": "includes/skins/MinervaTemplate.php",
"SkinMinerva": "includes/skins/SkinMinerva.php", "SkinMinerva": "includes/skins/SkinMinerva.php",
"SkinMinervaNeue": "includes/skins/SkinMinerva.php",
"ICustomizableSkin": "includes/skins/ICustomizableSkin.php", "ICustomizableSkin": "includes/skins/ICustomizableSkin.php",
"MediaWiki\\Minerva\\MenuBuilder": "includes/skins/MenuBuilder.php", "MediaWiki\\Minerva\\MenuBuilder": "includes/skins/MenuBuilder.php",
"MediaWiki\\Minerva\\MenuEntry": "includes/skins/MenuBuilder.php", "MediaWiki\\Minerva\\MenuEntry": "includes/skins/MenuBuilder.php",