3 files changed, 20 insertions, 10 deletions
diff --git a/lib/class/song.class.php b/lib/class/song.class.php
index e912e511..8cc89308 100644
--- a/lib/class/song.class.php
+++ b/lib/class/song.class.php
@@ -784,7 +784,7 @@ class Song {
 	function get_url($session_id='',$force_http='') { 
 
 		/* Define Variables we are going to need */
-		$user_id 	= scrub_out($GLOBALS['user']->id);
+		$user_id 	= $GLOBALS['user']->id ? scrub_out($GLOBALS['user']->id) : '-1'; 
 		$song_id	= $this->id;
 
 		if (Config::get('require_session')) { 
diff --git a/lib/class/user.class.php b/lib/class/user.class.php
index 2fc8412e..4708d1c2 100644
--- a/lib/class/user.class.php
+++ b/lib/class/user.class.php
@@ -70,13 +70,23 @@ class User {
 	 */
 	private function _get_info() {
 
+		// If the ID is -1 then
+		if ($this->id == '-1') { 
+			$data['username'] = 'System'; 
+			$data['fullname'] = 'Ampache User'; 
+			$data['access'] = '25'; 
+			return $data; 
+		} 
+
+		// Else...
 		$id = Dba::escape($this->id);
 
 		$sql = "SELECT * FROM `user` WHERE `id`='" . $id . "'";
-		
 		$db_results = Dba::query($sql);
 
-		return Dba::fetch_assoc($db_results);
+		$data = Dba::fetch_assoc($db_results);  
+
+		return $data; 
 
 	} // _get_info
 
@@ -312,15 +322,15 @@ class User {
 
 	} // is_logged_in
 
-	/*!
-		@function has_access
-		@discussion this function checkes to see if this user has access
-			to the passed action (pass a level requirement)
-	*/
+	/**
+	 * has_access
+	 * this function checkes to see if this user has access
+	 * to the passed action (pass a level requirement)
+	 */
 	function has_access($needed_level) { 
 
 		if (!Config::get('use_auth') || Config::get('demo_mode')) { return true; }
-
+		
 		if ($this->access >= $needed_level) { return true; }
 
 		return false;
diff --git a/lib/class/xmldata.class.php b/lib/class/xmldata.class.php
index ea5fb9bd..c9d49a3f 100644
--- a/lib/class/xmldata.class.php
+++ b/lib/class/xmldata.class.php
@@ -116,7 +116,7 @@ class xmlData {
 				$string .= "\t<artist id=\"0\"><![CDATA[Various]]></artist>\n"; 
 			} 
 			else { 
-				$string .= "\t<artist id=\"$album->artist\"><![CDATA[$album->artist_name]]></artist>\n"; 
+				$string .= "\t<artist id=\"$album->artist_id\"><![CDATA[$album->artist_name]]></artist>\n"; 
 			} 
 
 			$string .= "\t<year>$album->year</year>\n" .