Merge branch 'develop' into patch6

ampache · Mar 20, 2024 · fb1009b · fb1009b
2 parents 664e0bc + 2377172
commit fb1009b
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 4 deletions.
diff --git a/src/Module/Playlist/Search/AlbumDiskSearch.php b/src/Module/Playlist/Search/AlbumDiskSearch.php
@@ -320,7 +320,6 @@ public function getSql(
                     } else {
                         $where[] = "`song`.`file` $operator_sql ?";
                     }
-                    $where[]      = "`song`.`file` $operator_sql ?";
                     $parameters[] = $input;
                     $join['song'] = true;
                     break;

diff --git a/src/Module/Playlist/Search/SongSearch.php b/src/Module/Playlist/Search/SongSearch.php
@@ -153,7 +153,6 @@ public function getSql(
                     } else {
                         $where[] = "(`artist`.`name` $operator_sql ? OR LTRIM(CONCAT(COALESCE(`artist`.`prefix`, ''), ' ', `artist`.`name`)) $operator_sql ?)";
                     }
-                    $where[]        = "(`artist`.`name` $operator_sql ? OR LTRIM(CONCAT(COALESCE(`artist`.`prefix`, ''), ' ', `artist`.`name`)) $operator_sql ?)";
                     $parameters     = array_merge($parameters, array($input, $input));
                     $join['artist'] = true;
                     break;
@@ -163,7 +162,6 @@ public function getSql(
                     } else {
                         $where[] = "((`album_artist`.`name` $operator_sql ? OR LTRIM(CONCAT(COALESCE(`album_artist`.`prefix`, ''), ' ', `album_artist`.`name`)) $operator_sql ?))";
                     }
-                    $where[]               = "(`album_artist`.`name` $operator_sql ? OR LTRIM(CONCAT(COALESCE(`album_artist`.`prefix`, ''), ' ', `album_artist`.`name`)) $operator_sql ?)";
                     $parameters            = array_merge($parameters, array($input, $input));
                     $table['album']        = "LEFT JOIN `album` ON `song`.`album` = `album`.`id`";
                     $table['album_artist'] = "LEFT JOIN `artist` AS `album_artist` ON `album`.`album_artist` = `album_artist`.`id`";

diff --git a/src/Module/Playlist/Search/VideoSearch.php b/src/Module/Playlist/Search/VideoSearch.php
@@ -72,7 +72,6 @@ public function getSql(
                     } else {
                         $where[] = "`video`.`file` $operator_sql ?";
                     }
-                    $where[]      = "`video`.`file` $operator_sql ?";
                     $parameters[] = $input;
                     break;
             } // switch on ruletype