From 8fb7fef3f5afb0b4a625a564f991d5e5ec61ac2b Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Tue, 29 Aug 2017 10:37:19 +0200
Subject: [PATCH 1/2] regular expressions are never falsey

---
 www/common/toolbar3.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/common/toolbar3.js b/www/common/toolbar3.js
index c8faa738a..316f4849a 100644
--- a/www/common/toolbar3.js
+++ b/www/common/toolbar3.js
@@ -596,7 +596,7 @@ define([
 
         var origin = config.metadataMgr.getPrivateData().origin;
 
-        var href = inDrive ? origin+'/index.html' : origin+'/drive/';
+        var href = inDrive.test(origin) ? origin+'/index.html' : origin+'/drive/';
         var buttonTitle = inDrive ? Messages.header_homeTitle : Messages.header_logoTitle;
 
         var $aTag = $('<a>', {

From 40f062abdaa35facf2e69430314e203126218460 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Tue, 29 Aug 2017 10:50:02 +0200
Subject: [PATCH 2/2] restore app usage report in new pad

---
 www/pad/main.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/www/pad/main.js b/www/pad/main.js
index fdf4c970e..f93e4b53d 100644
--- a/www/pad/main.js
+++ b/www/pad/main.js
@@ -234,5 +234,6 @@ define([
                 Cryptpad.replaceHash(Cryptpad.getEditHashFromKeys(wc.id, secret.keys));
             }
         });
+        Cryptpad.reportAppUsage();
     });
 });