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

rpc.js

@@ -369,15 +369,19 @@ var getDeletedPads = function (Env, channels, cb) {
 
     var sem = Saferphore.create(10);
     var absentees = [];
-    nThen(function (w) {
-        for (var i = 0; i < L; i++) {
-            let channel = channels[i];
-            sem.take(function (give) {
-                getFileSize(Env, channel, w(give(function (e, size) {
+
+    var job = function (channel, wait) {
+        return function (give) {
+            getFileSize(Env, channel, wait(give(function (e, size) {
                 if (e) { return; }
                 if (size === 0) { absentees.push(channel); }
             })));
-            });
+        };
+    };
+
+    nThen(function (w) {
+        for (var i = 0; i < L; i++) {
+            sem.take(job(channels[i], w));
         }
     }).nThen(function () {
         cb(void 0, absentees);

storage/tasks.js

@@ -63,7 +63,7 @@ var write = function (env, task, cb) {
                 return void cb(err);
             }
         }));
-    }).nThen(function (w) {
+    }).nThen(function () {
         // write the file to the path
         Fs.writeFile(mkPath(env, id), str, function (e) {
             if (e) { return void cb(e); }