Merge remote-tracking branch 'origin/develop' into develop

2017-10-13 15:14:45 +00:00 · 2017-10-13 15:14:45 +00:00 · a4cdbd5fd4
parent f5abd1c2c8 d7c3fc9adb
commit a4cdbd5fd4
1 changed files with 4 additions and 1 deletions
--- a/src/UserSettingsStore.js
+++ b/src/UserSettingsStore.js
@ -202,7 +202,10 @@ export default {
    isFeatureEnabled: function(featureId: string): boolean {
        const featuresConfig = SdkConfig.get()['features'];

-        let sdkConfigValue = 'disable';
+        // The old flag: honourned for backwards compat
+        const enableLabs = SdkConfig.get()['enableLabs'];
+
+        let sdkConfigValue = enableLabs ? 'labs' : 'disable';
        if (featuresConfig && featuresConfig[featureId] !== undefined) {
            sdkConfigValue = featuresConfig[featureId];
        }