starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-16 14:03:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into mediaencoding

Browse Source
This commit is contained in:
Bond_009
2019-12-10 23:00:59 +01:00
parent c6d48f51f6 67922dff50
commit 0bf8bfbb0c
258 changed files with 3301 additions and 1673 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
MediaBrowser.Model/Configuration/ServerConfiguration.cs
View File

@@ -172,16 +172,18 @@ namespace MediaBrowser.Model.Configuration
if (string.IsNullOrWhiteSpace(value))
{
// If baseUrl is empty, set an empty prefix string
value = string.Empty;
_baseUrl = string.Empty;
return;
}
else if (!value.StartsWith("/"))
if (value[0] != '/')
{
// If baseUrl was not configured with a leading slash, append one for consistency
value = "/" + value;
}
// Normalize the end of the string
if (value.EndsWith("/"))
if (value[value.Length - 1] == '/')
{
// If baseUrl was configured with a trailing slash, remove it for consistency
value = value.Remove(value.Length - 1);