Merge "Add 'mediawiki.skinning.logo' module"

diff --git a/resources/Resources.php b/resources/Resources.php
index e6381c2..3571a13 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -109,6 +109,7 @@ return array(
        // Used in the web installer. Test it after modifying this definition!
        'mediawiki.skinning.interface' => array(
                'position' => 'top',
+               // Display wiki logo on .mw-wiki-logo elements.
                'class' => 'ResourceLoaderSkinModule',
                'styles' => array(
                        'resources/src/mediawiki.skinning/elements.css' => array( 'media' => 'screen' ),
@@ -135,6 +136,13 @@ return array(
                ),
        ),
 
+       // Display wiki logo on .mw-wiki-logo elements.
+       // This is also part of 'mediawiki.skinning.interface' module; the skin shouldn't load them both.
+       'mediawiki.skinning.logo' => array(
+               'position' => 'top',
+               'class' => 'ResourceLoaderSkinModule',
+       ),
+
        /* jQuery */
 
        'jquery' => array(