summaryrefslogtreecommitdiffstats
path: root/module/database
diff options
context:
space:
mode:
authorGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2013-01-02 18:11:31 +0100
committerGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2013-01-02 18:11:31 +0100
commit6b20f5f6c063e4e6c94d719b607ad5a028b8beee (patch)
treea8c3dfa9962aa819507870553700a35b7dcc4c74 /module/database
parentRemove '/' from filename to avoid filepath exception (diff)
downloadpyload-6b20f5f6c063e4e6c94d719b607ad5a028b8beee.tar.xz
new configManager for multi user configs
Diffstat (limited to 'module/database')
-rw-r--r--module/database/ConfigDatabase.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/module/database/ConfigDatabase.py b/module/database/ConfigDatabase.py
index 198ae0173..7dd5909b8 100644
--- a/module/database/ConfigDatabase.py
+++ b/module/database/ConfigDatabase.py
@@ -16,11 +16,12 @@ class ConfigMethods(DatabaseMethods):
@queue
def loadConfig(self, plugin, user=None):
if user is None:
- self.c.execute('SELECT config FROM settings WHERE plugin=?', (plugin, ))
+ self.c.execute('SELECT config FROM settings WHERE plugin=? AND user=-1', (plugin, ))
else:
self.c.execute('SELECT config FROM settings WHERE plugin=? AND user=?', (plugin, user))
- return self.c.fetchone()[0]
+ r = self.c.fetchone()
+ return r[0] if r else ""
@async
def deleteConfig(self, plugin, user=None):