Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

2017-08-29 11:03:05 +02:00
parent 901917983b 40f062abda
commit 642dc17910
2 changed files with 2 additions and 1 deletions
--- 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>', {