jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/365993 )
Change subject: Fixed notice from User default options
......................................................................
Fixed notice from User default options
MediaWiki allows only scalar values as user option. Some of our BlueSpice
Settings are arrays. This leads to notices.
ATTENTION: This change means that those user options are not available on the
client side!
NEEDS CHERRY-PICK TO REL1_27
Change-Id: I7ca48db0007280605ea22e20bff5943c19c02807
---
M UserPreferences/UserPreferences.class.php
1 file changed, 5 insertions(+), 1 deletion(-)
Approvals:
Pwirth: Looks good to me, approved
jenkins-bot: Verified
diff --git a/UserPreferences/UserPreferences.class.php
b/UserPreferences/UserPreferences.class.php
index 7140ca7..0d73abe 100644
--- a/UserPreferences/UserPreferences.class.php
+++ b/UserPreferences/UserPreferences.class.php
@@ -224,7 +224,11 @@
continue;
}
if( $oVariable->getOptions() & BsConfig::LEVEL_USER ) {
- $defaultOptions[$oVariable->getKey()] =
$oVariable->getValue();
+ $mValue = $oVariable->getValue();
+ if( !is_scalar( $mValue ) ) {
+ continue;
+ }
+ $defaultOptions[$oVariable->getKey()] = $mValue;
}
}
return true;
--
To view, visit https://gerrit.wikimedia.org/r/365993
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7ca48db0007280605ea22e20bff5943c19c02807
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_27
Gerrit-Owner: Pwirth <[email protected]>
Gerrit-Reviewer: Ljonka <[email protected]>
Gerrit-Reviewer: Mglaser <[email protected]>
Gerrit-Reviewer: Pwirth <[email protected]>
Gerrit-Reviewer: Robert Vogel <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
