diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-12-15 08:35:00 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-12-15 08:35:00 +0000 |
| commit | 1cf10721654764b366f6b105e76da071aa3c7f66 (patch) | |
| tree | 046769763526b68033e8bfb521389f8db1556e25 /lib/class/user.class.php | |
| parent | 5d98a104bc750053e90da5f8dd9664e0433f900d (diff) | |
| download | ampache-1cf10721654764b366f6b105e76da071aa3c7f66.tar.gz ampache-1cf10721654764b366f6b105e76da071aa3c7f66.tar.bz2 ampache-1cf10721654764b366f6b105e76da071aa3c7f66.zip | |
fixed two transcode bugs
Diffstat (limited to 'lib/class/user.class.php')
| -rw-r--r-- | lib/class/user.class.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/class/user.class.php b/lib/class/user.class.php index 1fa24adb..97477ae7 100644 --- a/lib/class/user.class.php +++ b/lib/class/user.class.php @@ -137,11 +137,11 @@ class User { // Fill out the user id $user_id = $user_id ? Dba::escape($user_id) : Dba::escape($this->id); - if (!Config::get('use_auth')) { $user_id = '-1'; } - if ($user_id != '-1') { $user_limit = "AND preference.catagory != 'system'"; } + + if (!Config::get('use_auth')) { $user_id = '-1'; } if ($type != '0') { $user_limit = "AND preference.catagory = '" . Dba::escape($type) . "'"; @@ -173,7 +173,9 @@ class User { */ public function set_preferences() { - $sql = "SELECT preference.name,user_preference.value FROM preference,user_preference WHERE user_preference.user='$this->id' " . + $user_id = Dba::escape($this->id); + + $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.type != 'system'"; $db_results = Dba::query($sql); |