Merge branch 'public/9.0' into public/9.1

Changelog9.html

@@ -71,8 +71,9 @@ <h2><a name="v9.0.2" id="v9.0.2"></a>Version 9.0.2</h2>
 		<li><a href="https://github.com/LMS-Community/slimserver/pull/1303">#1303</a> - Fix an issue where browsing releases would sometimes create thousands of parameters (and more - thanks @darrel-k!).</li>
 		<li><a href="https://github.com/LMS-Community/slimserver/pull/1306">#1306</a> - Don't run the scanner before we're done with the setup wizard.</li>
 		<li><a href="https://github.com/LMS-Community/slimserver/pull/1307">#1307</a> - Fix scanner progress information in the web UI.</li>
-		<li><a href="https://github.com/LMS-Community/slimserver/pull/1309">#1309</a> - Limit works advanced search to discovered albums. (thanks @darrel-k)</li>
+		<li><a href="https://github.com/LMS-Community/slimserver/pull/1309">#1309</a> - Limit works advanced search to discovered albums. (@darrel-k)</li>
 		<li><a href="https://github.com/LMS-Community/slimserver/issue/1314">#1314</a> - The server would seemingly hang when trying to connect to the Material skin as long as no work has been found.</li>
+		<li><a href="https://github.com/LMS-Community/slimserver/pull/1319">#1319</a> - Don't filter by release types if user pref is ignoreReleaseTypes (@darrel-k).</li>
 		<li></li>
 	</ul>
 	<br />

Slim/Menu/BrowseLibrary.pm

@@ -1455,11 +1455,13 @@ sub _albums {
 	}
 
 	# filter out some release types if wanted, unless we are already filtering for a release type
-	my %releaseTypesToIgnore = map { $_ => 1 } @{ $prefs->get('releaseTypesToIgnore') || [] };
-	if ( keys %releaseTypesToIgnore && !grep /^release_type:/, @searchTags) {
-		push @searchTags, 'release_type:' . join(',', grep {
-			!$releaseTypesToIgnore{$_}
-		} @{Slim::Schema::Album->releaseTypes});
+	if ( !$prefs->get('ignoreReleaseTypes') ) {
+		my %releaseTypesToIgnore = map { $_ => 1 } @{ $prefs->get('releaseTypesToIgnore') || [] };
+		if ( keys %releaseTypesToIgnore && !grep /^release_type:/, @searchTags) {
+			push @searchTags, 'release_type:' . join(',', grep {
+				!$releaseTypesToIgnore{$_}
+			} @{Slim::Schema::Album->releaseTypes});
+		}
 	}
 
 	my @artistIds = grep /artist_id:/, @searchTags;