diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-02-05 23:51:29 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-02-05 23:51:29 -0500 |
| commit | e72f59f8cdcc5f44c57b003d085a1077eb08669c (patch) | |
| tree | 444ce228fc02fe5afaf1eead531f4f30cd6dd252 /MediaBrowser.Api | |
| parent | 3925a7ca5f780dc6dc013f2cc648817170dbc660 (diff) | |
| parent | 00d24d6676d3ad47a0c2a0f5da2f58c5b4934203 (diff) | |
Merge branch 'dev' into beta
Diffstat (limited to 'MediaBrowser.Api')
| -rw-r--r-- | MediaBrowser.Api/StartupWizardService.cs | 1 | ||||
| -rw-r--r-- | MediaBrowser.Api/UserLibrary/ItemsService.cs | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/MediaBrowser.Api/StartupWizardService.cs b/MediaBrowser.Api/StartupWizardService.cs index 6556807c4..06db1de74 100644 --- a/MediaBrowser.Api/StartupWizardService.cs +++ b/MediaBrowser.Api/StartupWizardService.cs @@ -68,7 +68,6 @@ namespace MediaBrowser.Api _config.Configuration.EnableLocalizedGuids = true; _config.Configuration.EnableCustomPathSubFolders = true; _config.Configuration.EnableDateLastRefresh = true; - _config.Configuration.MergeMetadataAndImagesByName = true; _config.SaveConfiguration(); } diff --git a/MediaBrowser.Api/UserLibrary/ItemsService.cs b/MediaBrowser.Api/UserLibrary/ItemsService.cs index 1c5d5b345..761d10760 100644 --- a/MediaBrowser.Api/UserLibrary/ItemsService.cs +++ b/MediaBrowser.Api/UserLibrary/ItemsService.cs @@ -116,6 +116,10 @@ namespace MediaBrowser.Api.UserLibrary { item = user == null ? _libraryManager.RootFolder : user.RootFolder; } + else if (string.Equals(request.IncludeItemTypes, "BoxSet", StringComparison.OrdinalIgnoreCase)) + { + item = user == null ? _libraryManager.RootFolder : user.RootFolder; + } // Default list type = children |