diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2008-02-28 06:36:25 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2008-02-28 06:36:25 +0000 |
| commit | c1f2b35e2a18b0752746f5db5794cf18714bc71d (patch) | |
| tree | 279b008abb9c5585f957396c8da85bb429e033f9 /lib/class/preference.class.php | |
| parent | 7bdf3a77b706c01c1642a02f21823b74f8f930db (diff) | |
| download | ampache-c1f2b35e2a18b0752746f5db5794cf18714bc71d.tar.gz ampache-c1f2b35e2a18b0752746f5db5794cf18714bc71d.tar.bz2 ampache-c1f2b35e2a18b0752746f5db5794cf18714bc71d.zip | |
corrected a few queries, removed a few other useless ones that were already broken
Diffstat (limited to 'lib/class/preference.class.php')
| -rw-r--r-- | lib/class/preference.class.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/class/preference.class.php b/lib/class/preference.class.php index dadbbd17..a844d1b0 100644 --- a/lib/class/preference.class.php +++ b/lib/class/preference.class.php @@ -319,8 +319,9 @@ class Preference { public static function init() { /* Get Global Preferences */ - $sql = "SELECT preference.name,user_preference.value FROM preference,user_preference WHERE user_preference.user='-1' " . - " AND user_preference.preference = preference.id AND preference.catagory='system'"; + $sql = "SELECT `preference`.`name`,`user_preference`.`value` FROM `preference`,`user_preference` " . + "WHERE `user_preference`.`user`='-1' " . + "AND `user_preference`.`preference` = `preference`.`id` AND `preference`.`catagory` = 'system'"; $db_results = Dba::query($sql); while ($r = Dba::fetch_assoc($db_results)) { @@ -335,7 +336,7 @@ class Preference { } $sql = "SELECT preference.name,user_preference.value FROM preference,user_preference WHERE user_preference.user='$user_id' " . - " AND user_preference.preference = preference.id AND preference.catagory != 'system'"; + "AND user_preference.preference = preference.id AND preference.catagory != 'system'"; $db_results = Dba::query($sql); while ($r = Dba::fetch_assoc($db_results)) { |