diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-12-23 23:57:36 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-12-23 23:57:36 +0000 |
| commit | ee64379cf4c093d589502e72036759e66671cac7 (patch) | |
| tree | c658ba971765153f9c440c8ce015876f131b8f2a /lib | |
| parent | 4ea4de9def83a38fb34cf6a3dcefc29059954c69 (diff) | |
| download | ampache-ee64379cf4c093d589502e72036759e66671cac7.tar.gz ampache-ee64379cf4c093d589502e72036759e66671cac7.tar.bz2 ampache-ee64379cf4c093d589502e72036759e66671cac7.zip | |
fixed an issue with the flash player when the play method was not default
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/class/stream.class.php | 3 | ||||
| -rw-r--r-- | lib/init.php | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/lib/class/stream.class.php b/lib/class/stream.class.php index 6d620f03..7a925daa 100644 --- a/lib/class/stream.class.php +++ b/lib/class/stream.class.php @@ -728,6 +728,9 @@ class Stream { // If this wasn't ajax included run away if (AJAX_INCLUDE != '1') { return false; } + // If we're doin the flash magic then run away as well + if ($GLOBALS['user']->prefs['play_type'] == 'xspf_player') { return false; } + switch ($GLOBALS['user']->prefs['playlist_method']) { default: case 'clear': diff --git a/lib/init.php b/lib/init.php index 45184584..669be5f4 100644 --- a/lib/init.php +++ b/lib/init.php @@ -253,4 +253,8 @@ if (! preg_match('/update\.php/', $_SERVER['PHP_SELF'])) { exit(); } } + +// For the XMLRPC stuff +$GLOBALS['xmlrpc_internalencoding'] = Config::get('site_charset'); + ?> |