summaryrefslogtreecommitdiffstats
path: root/lib/class/catalog.class.php
diff options
context:
space:
mode:
Diffstat (limited to 'lib/class/catalog.class.php')
-rw-r--r--lib/class/catalog.class.php7
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/class/catalog.class.php b/lib/class/catalog.class.php
index e7942444..cfab9321 100644
--- a/lib/class/catalog.class.php
+++ b/lib/class/catalog.class.php
@@ -615,9 +615,9 @@ class Catalog {
// Define the options we want to use for the find art function
$options = array(
- 'album_name' => $album->name,
+ 'album_name' => $album->full_name,
'artist' => $album->artist_name,
- 'keyword' => $album->artist_name . ' ' . $album->name
+ 'keyword' => $album->artist_name . ' ' . $album->full_name
);
// Return results
@@ -2236,6 +2236,9 @@ class Catalog {
$sql = "DELETE FROM `song` WHERE `catalog` = '$catalog_id'";
$db_results = Dba::query($sql);
+ // Only if the previous one works do we go on
+ if (!$db_results) { return false; }
+
// Next Remove the Catalog Entry it's self
$sql = "DELETE FROM `catalog` WHERE `id` = '$catalog_id'";
$db_results = Dba::query($sql);