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

Merge branch 'soon' into staging

Browse Source
This commit is contained in:
yflory 2018-07-18 15:10:23 +02:00
commit ef73cf89cd
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
www/common/outer/userObject.js
View File

@ -645,7 +645,7 @@ define([
} }
// Fix href // Fix href
if (/^https*:\/\//.test(el.href)) { el.href = Hash.getRelativeHref(el.href); } if (el.href && /^https*:\/\//.test(el.href)) { el.href = Hash.getRelativeHref(el.href); }
// Fix creation time // Fix creation time
if (!el.ctime) { el.ctime = el.atime; } if (!el.ctime) { el.ctime = el.atime; }
// Fix title // Fix title

1
www/drive/inner.js
View File

@ -2622,6 +2622,7 @@ define([
sortedFiles.forEach(function (key) { sortedFiles.forEach(function (key) {
if (manager.isFolder(root[key])) { return; } if (manager.isFolder(root[key])) { return; }
var $element = createElement(path, key, root, false); var $element = createElement(path, key, root, false);
if (!$element) { return; }
$element.appendTo($list); $element.appendTo($list);
}); });