Fix an issue when trying to create a pad with a password from a template

2018-05-17 18:15:10 +02:00
parent f218a9c119
commit ef735d6fe6
2 changed files with 3 additions and 2 deletions
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -438,7 +438,7 @@ define([
                    optsGet.password = password;
                }), href);
            }
-            if (parsed2.hashData && parsed2.hashData.password) {
+            if (parsed2.hashData && parsed2.hashData.password && !optsPut.password) {
                common.getPadAttribute('password', waitFor(function (err, password) {
                    optsPut.password = password;
                }));