From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Mon, 1 Jun 2015 17:16:54 +0000 (+0000)
Subject: Merge "Add 'mediawiki.skinning.logo' module"
X-Git-Tag: 1.31.0-rc.0~11231
X-Git-Url: https://git.cyclocoop.org/%28%28?a=commitdiff_plain;h=9e4bb78836349ffd88d2fe36ac51b54595fea966;hp=0e841380176805b078bf35553e5d4406a4a6ab9d;p=lhc%2Fweb%2Fwiklou.git

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

diff --git a/resources/Resources.php b/resources/Resources.php
index e6381c29c1..3571a130f9 100644
--- 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(