Merge 0.10->trunk

1 files changed, 9 insertions, 2 deletions

diff --git a/plugins/mod_storage_internal.lua b/plugins/mod_storage_internal.lua
index 21a63c95..0a382cee 100644
--- a/plugins/mod_storage_internal.lua
+++ b/plugins/mod_storage_internal.lua
@@ -139,12 +139,19 @@ function archive:delete(username, query)
 		if k ~= "end" then return nil, "unsupported-query-field"; end
 	end
 	local items, err = datamanager.list_load(username, host, self.store);
-	if not items then return items, err; end
+	if not items then
+		if err then
+			return items, err;
+		end
+		-- Store is empty
+		return 0;
+	end
 	items = array(items);
+	local count_before = #items;
 	items:filter(function (item)
 		return item.when > query["end"];
 	end);
-	local count = #items;
+	local count = count_before - #items;
 	local ok, err = datamanager.list_store(username, host, self.store, items);
 	if not ok then return ok, err; end
 	return count;