fix bug in Album::check

ampache · Nov 25, 2019 · b9f50fa · b9f50fa
1 parent 5186ad3
commit b9f50fa
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/lib/class/album.class.php b/lib/class/album.class.php
@@ -503,7 +503,7 @@ public static function check($name, $year = 0, $disk = 1, $mbid = null, $mbid_gr
             return self::$_mapcache[$name][$disk][$year][$original_year][$mbid][$mbid_group][$album_artist];
         }
 
-        $sql    = "SELECT `album`.`id` FROM `album` WHERE (`album`.`name` = ? OR LTRIM(CONCAT(COALESCE(`album`.`prefix`, ''), ' ', `album`.`name`)) = ?) AND `album`.`disk` = ? AND `album`.`year` = ? AND `album`.`original_year` = ? ";
+        $sql    = "SELECT `album`.`id` FROM `album` WHERE (`album`.`name` = ? OR LTRIM(CONCAT(COALESCE(`album`.`prefix`, ''), ' ', `album`.`name`)) = ?) AND `album`.`disk` = ? AND `album`.`year` = ? ";
         $params = array($name, $name, $disk, $year, $original_year);
 
         if ($mbid) {
@@ -516,11 +516,14 @@ public static function check($name, $year = 0, $disk = 1, $mbid = null, $mbid_gr
             $sql .= 'AND `album`.`prefix` = ? ';
             $params[] = $prefix;
         }
-
         if ($album_artist) {
             $sql .= 'AND `album`.`album_artist` = ? ';
             $params[] = $album_artist;
         }
+        if ($original_year) {
+            $sql .= 'AND `album`.`original_year` = ? ';
+            $params[] = $original_year;
+        }
 
         $db_results = Dba::read($sql, $params);