Merge branch 'staging' into framework

2017-10-02 17:46:27 +03:00 · 2017-10-02 17:46:27 +03:00 · 53f65f6a87
commit 53f65f6a87
parent fa6938baa8 0f9e93e1de
2 changed files with 1 additions and 0 deletions
--- a/www/common/userObject.js
+++ b/www/common/userObject.js
@ -426,6 +426,7 @@ define([

            getFiles([FILES_DATA]).forEach(function (id) {
                var data = allFilesList[id];
+                if (!data) { return; }
                if (Array.isArray(data.tags) && containsSearchedTag(data.tags)) {
                    res.push(id);
                } else
--- a/www/olddrive/tests.js
+++ b/www/olddrive/tests.js