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 | |
| 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
| -rwxr-xr-x | docs/CHANGELOG | 1 | ||||
| -rw-r--r-- | lib/class/stream.class.php | 3 | ||||
| -rw-r--r-- | lib/init.php | 4 | ||||
| -rw-r--r-- | modules/xmlrpc/xmlrpc.inc | 6 |
4 files changed, 10 insertions, 4 deletions
diff --git a/docs/CHANGELOG b/docs/CHANGELOG index d529f30a..7eb72985 100755 --- a/docs/CHANGELOG +++ b/docs/CHANGELOG @@ -4,6 +4,7 @@ -------------------------------------------------------------------------- v.3.4-Alpha4 + - Fixed Flash Player issue when Playlist Method wasn't default - Fixed XML-RPC, now uses handshake method properly - Fixed bug where stream would start even with no songs - Upgraded to Prototype 1.6 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'); + ?> diff --git a/modules/xmlrpc/xmlrpc.inc b/modules/xmlrpc/xmlrpc.inc index d4b384be..ad08a05a 100644 --- a/modules/xmlrpc/xmlrpc.inc +++ b/modules/xmlrpc/xmlrpc.inc @@ -2551,7 +2551,7 @@ xmlrpc_encode_entitites($this->errstr, $GLOBALS['xmlrpc_internalencoding'], $cha xml_parser_free($parser); if($this->debug) { - print $errstr; + debug_event('XMLRPC',$errstr,'1','xmlrpc'); } $r->hdrs = $GLOBALS['_xh']['headers']; $r->_cookies = $GLOBALS['_xh']['cookies']; @@ -2584,11 +2584,9 @@ xmlrpc_encode_entitites($this->errstr, $GLOBALS['xmlrpc_internalencoding'], $cha { if ($this->debug) { - print "<PRE>---PARSED---\n"; // somehow htmlentities chokes on var_export, and some full html string... //print htmlentitites(var_export($GLOBALS['_xh']['value'], true)); - print htmlspecialchars(var_export($GLOBALS['_xh']['value'], true)); - print "\n---END---</PRE>"; + debug_event('XMLRPC',var_export($GLOBALS['_xh']['value'],true),'1','xmlrpc'); } // note that using =& will raise an error if $GLOBALS['_xh']['st'] does not generate an object. |