Merge 0.9->trunk

1 files changed, 1 insertions, 5 deletions

diff --git a/util/datamanager.lua b/util/datamanager.lua
index 08d9d6af..b70ad931 100644
--- a/util/datamanager.lua
+++ b/util/datamanager.lua
@@ -113,12 +113,9 @@ function getpath(username, host, datastore, ext, create)
 	if username then
 		if create then mkdir(mkdir(mkdir(data_path).."/"..host).."/"..datastore); end
 		return format("%s/%s/%s/%s.%s", data_path, host, datastore, username, ext);
-	elseif host then
+	else
 		if create then mkdir(mkdir(data_path).."/"..host); end
 		return format("%s/%s/%s.%s", data_path, host, datastore, ext);
-	else
-		if create then mkdir(data_path); end
-		return format("%s/%s.%s", data_path, datastore, ext);
 	end
 end
 
@@ -343,7 +340,6 @@ end
 
 function purge(username, host)
 	local host_dir = format("%s/%s/", data_path, encode(host));
-	local deleted = 0;
 	local errs = {};
 	for file in lfs.dir(host_dir) do
 		if lfs.attributes(host_dir..file, "mode") == "directory" then