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

2017-03-29 11:56:13 +02:00
parent 76990ac1b2 7ede430db3
commit 4d5baa717d
1 changed files with 1 additions and 1 deletions
--- a/www/drive/main.js
+++ b/www/drive/main.js
@@ -1783,7 +1783,7 @@ define([
                var isInSearchTmp = currentPath[0] === SEARCH;
                if ($input.val().trim() === "") {
                    setSearchCursor(0);
-                    if (search.oldLocation.length) { displayDirectory(search.oldLocation); }
+                    if (search.oldLocation && search.oldLocation.length) { displayDirectory(search.oldLocation); }
                    return;
                }
                if (e.which === 13) {