Merge branch 'staging' into team

www/common/outer/async-store.js

@@ -1775,14 +1775,19 @@ define([
             // If we don't check now, Listmap will create an empty proxy if it no longer exists on
             // the server.
             nThen(function (waitFor) {
-                var edPublic = store.proxy.edPublic;
-                var checkExpired = Object.keys(shared).filter(function (fId) {
+                //var edPublic = store.proxy.edPublic;
+                /*var checkExpired = Object.keys(shared).filter(function (fId) {
                     var d = shared[fId];
                     return (Array.isArray(d.owners) && d.owners.length &&
                             (!edPublic || d.owners.indexOf(edPublic) === -1))
                             || (d.expire && d.expire < (+new Date()));
                 }).map(function (fId) {
                     return shared[fId].channel;
+                });*/
+                // XXX test: we probably shouldn't filter shared folder anymore here because
+                // the owner or the expiration time can change, so they can all be deleted
+                var checkExpired = Object.keys(shared).map(function (fId) {
+                    return shared[fId].channel;
                 });
                 Store.getDeletedPads(null, {list: checkExpired}, waitFor(function (chans) {
                     if (chans && chans.error) { return void console.error(chans.error); }