summaryrefslogtreecommitdiffstats
path: root/lib/class/catalog.class.php
diff options
context:
space:
mode:
authorKarl Vollmer <vollmerk@ampache.org>2011-12-01 15:59:33 -0400
committerKarl Vollmer <vollmerk@ampache.org>2011-12-01 15:59:33 -0400
commit56eb2ac7dcfa0b7e0269612632b7944ff7b6b51f (patch)
tree3a469afc6428fabc8912210c76247c3aaa89052c /lib/class/catalog.class.php
parentd1af05595c46c59a7d3992925d2ab6f0e14e5dbe (diff)
downloadampache-56eb2ac7dcfa0b7e0269612632b7944ff7b6b51f.tar.gz
ampache-56eb2ac7dcfa0b7e0269612632b7944ff7b6b51f.tar.bz2
ampache-56eb2ac7dcfa0b7e0269612632b7944ff7b6b51f.zip
Fixed two PHP warnings, and some issues with how users were being constructed
in init (which makes me wonder) and started trying to figure out why libre.fm broke
Diffstat (limited to 'lib/class/catalog.class.php')
-rw-r--r--lib/class/catalog.class.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/class/catalog.class.php b/lib/class/catalog.class.php
index cfd1b66e..a75264ea 100644
--- a/lib/class/catalog.class.php
+++ b/lib/class/catalog.class.php
@@ -2182,7 +2182,7 @@ class Catalog extends database_object {
*/
// Strip the SSID off of the url, we will need to regenerate this every time
- $url = preg_replace("/SSID=.*&/","",$song['url']);
+ $url = preg_replace("/ssid=.*&/","",$song['url']);
$title = Dba::escape($song['title']);
$album = self::check_album($song['album'],$song['year'],null,$song['album_mbid']);
$artist = self::check_artist($song['artist'],$song['artist_mbid']);