web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'sfPassword' into ro

Browse Source
This commit is contained in:
yflory
2019-10-22 17:26:32 +02:00
parent e6267a89ff 126f10b782
commit 9477ae0895
14 changed files with 199 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
www/common/userObject.js
View File

@@ -453,8 +453,8 @@ define([
var result;
var noPassword = function (str) {
if (!str) { return; }
var value = str.replace(/\/p\/?/, '/');
return Hash.getRelativeHref(value);
var parsed = Hash.parsePadUrl(str);
return parsed.getUrl().replace(/\/p\/?/, '/');
};
var href = noPassword(_href);
getFiles([FILES_DATA]).some(function (id) {
@@ -471,8 +471,8 @@ define([
var result;
var noPassword = function (str) {
if (!str) { return; }
var value = str.replace(/\/p\/?/, '/');
return Hash.getRelativeHref(value);
var parsed = Hash.parsePadUrl(str);
return parsed.getUrl().replace(/\/p\/?/, '/');
};
var href = noPassword(_href);
getFiles([SHARED_FOLDERS]).some(function (id) {