OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

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

pull/21833/head
Weblate 2018-04-26 14:24:23 +00:00
parent 1845ce29df 05f1ca6942
commit ceb7bfc863
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Analytics.js
View File

@ -190,6 +190,7 @@ class Analytics {
}
_setVisitVariable(key, value) {
if (this.disabled) return;
this._paq.push(['setCustomVariable', customVariables[key].id, key, value, 'visit']);
}
@ -199,8 +200,8 @@ class Analytics {
const config = SdkConfig.get();
if (!config.piwik) return;
const whitelistedHSUrls = config.piwik.whitelistedHSUrls;
const whitelistedISUrls = config.piwik.whitelistedISUrls;
const whitelistedHSUrls = config.piwik.whitelistedHSUrls || [];
const whitelistedISUrls = config.piwik.whitelistedISUrls || [];
this._setVisitVariable('User Type', isGuest ? 'Guest' : 'Logged In');
this._setVisitVariable('Homeserver URL', whitelistRedact(whitelistedHSUrls, homeserverUrl));

2
src/components/structures/MatrixChat.js
View File

@ -352,7 +352,7 @@ export default React.createClass({
defaultDeviceDisplayName: this.props.defaultDeviceDisplayName,
});
}).catch((e) => {
console.error(`Error attempting to load session: ${e}`);
console.error('Error attempting to load session', e);
return false;
}).then((loadedSession) => {
if (!loadedSession) {