Andrew Bogott has submitted this change and it was merged.
Change subject: Don't override the logo if it has already been customized.
......................................................................
Don't override the logo if it has already been customized.
It was pointed out to me that the previous code
clobbered any logo customizing done in orig/LocalSettings.php.
Change-Id: I4ac1f8423a0c7fac14f81327a5eb24e08b88d803
---
M modules/mediawiki_singlenode/templates/labs-localsettings
1 file changed, 5 insertions(+), 1 deletion(-)
Approvals:
Andrew Bogott: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/mediawiki_singlenode/templates/labs-localsettings
b/modules/mediawiki_singlenode/templates/labs-localsettings
index 080fec6..e15ac52 100644
--- a/modules/mediawiki_singlenode/templates/labs-localsettings
+++ b/modules/mediawiki_singlenode/templates/labs-localsettings
@@ -28,7 +28,11 @@
# Include the complete settings file generated by mw install
require_once( 'orig/LocalSettings.php' );
-$wgLogo = "$wgStylePath/common/images/labs_mediawiki_logo.png";
+if ( ! $wgLogo or $wgLogo == '/wiki/skins/common/images/wiki.png' ) {
+ # Logo is either unset or defaulting to the standard wiki logo;
+ # use a labs one instead.
+ $wgLogo = "$wgStylePath/common/images/labs_mediawiki_logo.png";
+}
# Offer possibility to require addition things in the respective role
<% role_requires.each do | req | -%>
--
To view, visit https://gerrit.wikimedia.org/r/61994
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4ac1f8423a0c7fac14f81327a5eb24e08b88d803
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
