diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2010-02-14 00:56:07 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2010-02-14 00:56:07 +0000 |
| commit | 8bc17dd3f0ed4dc520bb64b20dac8a31e72e447f (patch) | |
| tree | 49fc67aaf19bfbc749c54d22522f31cfea8fabb5 /lib/class/user.class.php | |
| parent | 704e66d0b489a7d3b0d4dcedc79515e5300732ff (diff) | |
| download | ampache-8bc17dd3f0ed4dc520bb64b20dac8a31e72e447f.tar.gz ampache-8bc17dd3f0ed4dc520bb64b20dac8a31e72e447f.tar.bz2 ampache-8bc17dd3f0ed4dc520bb64b20dac8a31e72e447f.zip | |
Tweaked how features / bandwidth level is checked, not happy with it.
Diffstat (limited to 'lib/class/user.class.php')
| -rw-r--r-- | lib/class/user.class.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/class/user.class.php b/lib/class/user.class.php index 40065922..27d901bf 100644 --- a/lib/class/user.class.php +++ b/lib/class/user.class.php @@ -197,7 +197,8 @@ class User extends database_object { $sql = "SELECT preference.name, preference.description, preference.catagory, preference.level, user_preference.value " . "FROM preference INNER JOIN user_preference ON user_preference.preference=preference.id " . - "WHERE user_preference.user='$user_id' " . $user_limit . " ORDER BY preference.catagory, preference.description"; + "WHERE user_preference.user='$user_id' " . $user_limit . + " ORDER BY preference.catagory, preference.description"; $db_results = Dba::read($sql); @@ -207,7 +208,6 @@ class User extends database_object { $admin = false; if ($type == 'system') { $admin = true; } $type_array[$type][$r['name']] = array('name'=>$r['name'],'level'=>$r['level'],'description'=>$r['description'],'value'=>$r['value']); - //ksort($type_array[$type]); // sorted this via sql and added sub-category sorting - Vlet $results[$type] = array ('title'=>ucwords($type),'admin'=>$admin,'prefs'=>$type_array[$type]); } // end while |