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

6 years ago · 7443c32803
parent f538a05044 26540b4b94
commit 7443c32803
1 changed files with 1 additions and 1 deletions
--- a/server.js
+++ b/server.js
@ -176,7 +176,7 @@ app.get('/api/config', function(req, res){
            httpUnsafeOrigin: config.httpUnsafeOrigin,
        }, null, '\t'),
        'obj.httpSafeOrigin = ' + (function () {
-            if (config.httpSafeOrigin) { return config.httpSafeOrigin; }
+            if (config.httpSafeOrigin) { return '"' + config.httpSafeOrigin + '"'; }
            if (config.httpSafePort) {
                return "(function () { return window.location.origin.replace(/\:[0-9]+$/, ':" +
                    config.httpSafePort + "'); }())";