fix url to song, and throw some non-working tag cloud crap in

2 files changed, 4 insertions, 1 deletions

diff --git a/lib/class/song.class.php b/lib/class/song.class.php
index d0311112..9f5259ef 100644
--- a/lib/class/song.class.php
+++ b/lib/class/song.class.php
@@ -887,7 +887,7 @@ class Song extends database_object implements media {
 		// We only care about the question mark stuff
 		$query = parse_url($url,PHP_URL_QUERY); 
 
-		$elements = explode("&",unhtmlentities($query)); 
+		$elements = explode("&",$query); 
 
 		foreach ($elements as $items) { 
 			list($key,$value) = explode("=",$items); 
diff --git a/lib/class/xmldata.class.php b/lib/class/xmldata.class.php
index 5fa58e71..b1b97264 100644
--- a/lib/class/xmldata.class.php
+++ b/lib/class/xmldata.class.php
@@ -339,6 +339,9 @@ class xmlData {
 		// Foreach the ids!
 		foreach ($songs as $song_id) { 
 			$song = new Song($song_id); 
+
+			// If the song id is invalid/null
+			if (!$song->id) { continue; } 
 			$song->format(); 
 
 			$tag_string = '';