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

2017-06-02 12:41:29 +00:00 · 2017-06-02 12:41:29 +00:00 · 82dc60fff4
commit 82dc60fff4
parent 6fda27bf48 375b435dfe
1 changed files with 2 additions and 0 deletions
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@ -777,6 +777,8 @@ module.exports = React.createClass({
    },

    _renderAnalyticsControl: function() {
+        if (!SdkConfig.get().piwik) return <div/>;
+
        return <div>
            <h3>{ _t('Analytics') }</h3>
            <div className="mx_UserSettings_section">