Merge branch 'soon' into staging

7 years ago · ef73cf89cd
parent 36480cf746 8eccffd8e4
commit ef73cf89cd
2 changed files with 2 additions and 1 deletions
--- a/www/common/outer/userObject.js
+++ b/www/common/outer/userObject.js
@ -645,7 +645,7 @@ define([
                    }

                    // 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
                    if (!el.ctime) { el.ctime = el.atime; }
                    // Fix title
--- a/www/drive/inner.js
+++ b/www/drive/inner.js
@ -2622,6 +2622,7 @@ define([
                sortedFiles.forEach(function (key) {
                    if (manager.isFolder(root[key])) { return; }
                    var $element = createElement(path, key, root, false);
+                    if (!$element) { return; }
                    $element.appendTo($list);
                });