jenkins-bot has submitted this change and it was merged.
Change subject: BSFoundation: Fixed $wgLogo overwrite (for now)
......................................................................
BSFoundation: Fixed $wgLogo overwrite (for now)
Change-Id: Ib3e38217e897fa0b88e53d90447eaf6914b3365c
---
M includes/CoreHooks.php
1 file changed, 4 insertions(+), 4 deletions(-)
Approvals:
Robert Vogel: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/CoreHooks.php b/includes/CoreHooks.php
index 4ededc7..e76f373 100755
--- a/includes/CoreHooks.php
+++ b/includes/CoreHooks.php
@@ -46,9 +46,6 @@
HTMLForm::$typeMappings['multiselectex'] = 'HTMLMultiSelectEx';
HTMLForm::$typeMappings['multiselectplusadd'] =
'HTMLMultiSelectPlusAdd';
HTMLForm::$typeMappings['multiselectsort'] =
'HTMLMultiSelectSortList';
-
- global $wgLogo;
- $wgLogo = BsConfig::get('MW::LogoPath');
}
/**
@@ -60,7 +57,10 @@
* @return boolean
*/
public static function onBeforePageDisplay( $out, $skin ) {
- global $IP, $wgFavicon, $wgExtensionAssetsPath;
+ global $IP, $wgFavicon, $wgExtensionAssetsPath, $wgLogo;
+
+ //TODO: Change this mechanism to make it overwriteable!
+ $wgLogo = BsConfig::get('MW::LogoPath');
// Append CSS for icon font support
$out->addHeadItem(
--
To view, visit https://gerrit.wikimedia.org/r/310548
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib3e38217e897fa0b88e53d90447eaf6914b3365c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Pwirth <wi...@hallowelt.biz>
Gerrit-Reviewer: Dvogel hallowelt <daniel.vo...@hallowelt.com>
Gerrit-Reviewer: Ljonka <l.verhovs...@gmail.com>
Gerrit-Reviewer: Mglaser <gla...@hallowelt.biz>
Gerrit-Reviewer: Robert Vogel <vo...@hallowelt.biz>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
