diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-07-06 08:40:00 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-07-06 08:40:00 +0000 |
| commit | feae56b4d308f2411b5c2bb5e644efe0dc3d5cb1 (patch) | |
| tree | 4a27a3fcd1450fba6c8fbf7871b45b09f7293256 | |
| parent | e07f720bbcb5aa4f1539a0edeeb8c737ae2abf94 (diff) | |
| download | ampache-feae56b4d308f2411b5c2bb5e644efe0dc3d5cb1.tar.gz ampache-feae56b4d308f2411b5c2bb5e644efe0dc3d5cb1.tar.bz2 ampache-feae56b4d308f2411b5c2bb5e644efe0dc3d5cb1.zip | |
sync lastfm fix to trunk
| -rwxr-xr-x | docs/CHANGELOG | 4 | ||||
| -rw-r--r-- | lib/class/scrobbler.class.php | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/docs/CHANGELOG b/docs/CHANGELOG index 91a20f52..67fa1b42 100755 --- a/docs/CHANGELOG +++ b/docs/CHANGELOG @@ -4,7 +4,9 @@ -------------------------------------------------------------------------- v.3.4-Alpha1 - - Fixed lastFM and increased timeout slightly in an attempt to + - Updated LastFM submission formating to account for changes on + last.fm (Thx entropathy) + - Fixed LastFM and increased timeout slightly in an attempt to improve success rate - Disabled Search, Random Play & Localplay for Alpha release - Repalced CC Flash player with the previous GPL based flash player diff --git a/lib/class/scrobbler.class.php b/lib/class/scrobbler.class.php index a90fc773..352d51ae 100644 --- a/lib/class/scrobbler.class.php +++ b/lib/class/scrobbler.class.php @@ -107,7 +107,7 @@ class scrobbler { return false; } - if(preg_match('/http:\/\/(.*):(\d+)(.*)/', $response[3], $matches)) { + if(preg_match('/http:\/\/(.*):(\d+)(.*)/', $response[2], $matches)) { $this->submit_host = $matches[1]; $this->submit_port = $matches[2]; $this->submit_url = $matches[3]; @@ -116,7 +116,7 @@ class scrobbler { return false; } - $this->challenge = $response[2]; + $this->challenge = $response[1]; return true; } // handshake |