diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2008-02-29 06:14:46 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2008-02-29 06:14:46 +0000 |
| commit | 2c337852cff31297d681fb87d3098cc3d9041101 (patch) | |
| tree | 9853ce94387c4cc7756575598dfb1e2de44a8589 /modules/localplay | |
| parent | c1f2b35e2a18b0752746f5db5794cf18714bc71d (diff) | |
| download | ampache-2c337852cff31297d681fb87d3098cc3d9041101.tar.gz ampache-2c337852cff31297d681fb87d3098cc3d9041101.tar.bz2 ampache-2c337852cff31297d681fb87d3098cc3d9041101.zip | |
major corrections to reading of preferences and a few misc fixes which I have now forgotten
Diffstat (limited to 'modules/localplay')
| -rw-r--r-- | modules/localplay/httpq.controller.php | 2 | ||||
| -rw-r--r-- | modules/localplay/mpd.controller.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/localplay/httpq.controller.php b/modules/localplay/httpq.controller.php index 37c7edde..9a67a249 100644 --- a/modules/localplay/httpq.controller.php +++ b/modules/localplay/httpq.controller.php @@ -228,7 +228,7 @@ class AmpacheHttpq extends localplay_controller { */ public function get_instance($instance='') { - $instance = $instance ? $instance : $GLOBALS['user']->prefs['httpq_active']; + $instance = $instance ? $instance : Config::get('httpq_active'); $instance = Dba::escape($instance); $sql = "SELECT * FROM `localplay_httpq` WHERE `id`='$instance'"; diff --git a/modules/localplay/mpd.controller.php b/modules/localplay/mpd.controller.php index a1f45a36..fecc327c 100644 --- a/modules/localplay/mpd.controller.php +++ b/modules/localplay/mpd.controller.php @@ -191,7 +191,7 @@ class AmpacheMpd extends localplay_controller { */ public function get_instance($instance='') { - $instance = $instance ? $instance : $GLOBALS['user']->prefs['mpd_active']; + $instance = $instance ? $instance : Config::get('mpd_active'); $instance = Dba::escape($instance); $sql = "SELECT * FROM `localplay_mpd` WHERE `id`='$instance'"; |