diff options
| author | Luke <luke.pulverenti@gmail.com> | 2015-06-15 00:28:29 -0400 |
|---|---|---|
| committer | Luke <luke.pulverenti@gmail.com> | 2015-06-15 00:28:29 -0400 |
| commit | 7d9d57a36ecee8e8a74b92544166c8fe70a0f880 (patch) | |
| tree | a7f8a6bdb038048449d45a1e8926843015886f97 /MediaBrowser.Api/BrandingService.cs | |
| parent | 5aafbe3dd694813a4e68f21ee72e59d6c53e776a (diff) | |
| parent | 55eb54cbc28e40254a50c5a25443e910798243dc (diff) | |
Merge pull request #1118 from MediaBrowser/dev
3.0.5641.4
Diffstat (limited to 'MediaBrowser.Api/BrandingService.cs')
| -rw-r--r-- | MediaBrowser.Api/BrandingService.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/MediaBrowser.Api/BrandingService.cs b/MediaBrowser.Api/BrandingService.cs index ac491a997..c900e4d06 100644 --- a/MediaBrowser.Api/BrandingService.cs +++ b/MediaBrowser.Api/BrandingService.cs @@ -34,7 +34,8 @@ namespace MediaBrowser.Api { var result = _config.GetConfiguration<BrandingOptions>("branding"); - return ResultFactory.GetResult(result.CustomCss, "text/css"); + // When null this throws a 405 error under Mono OSX, so default to empty string + return ResultFactory.GetResult(result.CustomCss ?? string.Empty, "text/css"); } } } |