Merge pull request #11 from ardi69/0.4.10

some fixes

2 files changed, 3 insertions, 3 deletions

diff --git a/pyload/database/Backend.py b/pyload/database/Backend.py
index e851885c0..1fa7a654c 100644
--- a/pyload/database/Backend.py
+++ b/pyload/database/Backend.py
@@ -186,11 +186,11 @@ class DatabaseBackend(Thread):
                     print "Filedatabase was deleted due to incompatible version."
                 remove("files.version")
                 move("files.db", "files.backup.db")
-            
+
             with open("files.version", "wb") as f:
                 f.write(str(DB_VERSION))
 
-        return v
+            return v
 
 
     def _convertDB(self, v):
diff --git a/pyload/database/User.py b/pyload/database/User.py
index 2aedc3bba..b5b44c50a 100644
--- a/pyload/database/User.py
+++ b/pyload/database/User.py
@@ -82,7 +82,7 @@ class UserMethods(object):
     @style.queue
     def getAllUserData(db):
         db.c.execute("SELECT name, permission, role, template, email FROM users")
-        return {{"permission": r[1], "role": r[2], "template": r[3], "email": r[4]} for r in db.c}
+        return {r[0]: {"permission": r[1], "role": r[2], "template": r[3], "email": r[4]} for r in db.c}
 
 
     @style.queue