From 0bacebf1eb56430e0c0013be1604045ca25246ef Mon Sep 17 00:00:00 2001
From: Karl 'vollmerk' Vollmer <vollmer@ampache.org>
Date: Mon, 27 Mar 2006 08:16:02 +0000
Subject: fixed a problem where it would redirect you back to an empty
 album/artist view

---
 lib/class/catalog.class.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/class/catalog.class.php b/lib/class/catalog.class.php
index c2af2cda..66b675b4 100644
--- a/lib/class/catalog.class.php
+++ b/lib/class/catalog.class.php
@@ -1263,6 +1263,8 @@ class Catalog {
 	 */
 	function clean_single_song($song) { 
 
+		$results = array();
+
 		/* A'right let's check genre first */
 		$sql = "SELECT song.genre FROM song WHERE genre='" . $song->genre . "'";
 		$db_results = mysql_query($sql, dbh());
@@ -1270,6 +1272,7 @@ class Catalog {
 		if (!mysql_num_rows($db_results)) { 
 			$sql = "DELETE FROM genre WHERE id='" . $song->genre . "'";
 			$db_results = mysql_query($sql, dbh());
+			$results['genre'] = true;
 		}
 
 		/* Now for the artist */
@@ -1279,6 +1282,7 @@ class Catalog {
 		if (!mysql_num_rows($db_results)) { 
 			$sql = "DELETE FROM artist WHERE id='" . $song->artist . "'";
 			$db_results = mysql_query($sql, dbh());
+			$results['artist'] = true;
 		}
 
 		/* Now for the album */
@@ -1288,9 +1292,10 @@ class Catalog {
 		if (!mysql_num_rows($db_results)) { 
 			$sql = "DELETE FROM album WHERE id='" . $song->album . "'";
 			$db_results = mysql_query($sql, dbh());
+			$results['album'] = true;
 		}
 
-		return true;
+		return $results;
 
 	} // clean_single_song
 
-- 
cgit