summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorKarl 'vollmerk' Vollmer <vollmer@ampache.org>2006-03-27 08:16:02 +0000
committerKarl 'vollmerk' Vollmer <vollmer@ampache.org>2006-03-27 08:16:02 +0000
commit0bacebf1eb56430e0c0013be1604045ca25246ef (patch)
treefa6e24332b918dac039e000da50e61e8ec7b872d /lib
parent664bd9a28aa10eedee3deb82cda9b99b91b51fa0 (diff)
downloadampache-0bacebf1eb56430e0c0013be1604045ca25246ef.tar.gz
ampache-0bacebf1eb56430e0c0013be1604045ca25246ef.tar.bz2
ampache-0bacebf1eb56430e0c0013be1604045ca25246ef.zip
fixed a problem where it would redirect you back to an empty album/artist view
Diffstat (limited to 'lib')
-rw-r--r--lib/class/catalog.class.php7
1 files changed, 6 insertions, 1 deletions
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