alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-03-17 15:46:22 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Merge pull request #1337 from jellyfin/release-10.3.z

Browse Source 
Backmerge for 10.3.2 release
This commit is contained in:
Joshua M. Boniface
2019-04-30 23:35:11 -04:00
committed by GitHub
parent 61d7bed181 e8196fed7c
commit 2bc378a9c3
32 changed files with 409 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Emby.Server.Implementations/HttpServer/HttpResultFactory.cs
View File

@@ -629,7 +629,7 @@ namespace Emby.Server.Implementations.HttpServer
if (lastModifiedDate.HasValue)
{
responseHeaders[HeaderNames.LastModified] = lastModifiedDate.ToString();
responseHeaders[HeaderNames.LastModified] = lastModifiedDate.Value.ToString(CultureInfo.InvariantCulture);
}
}

2
Emby.Server.Implementations/Library/UserManager.cs
View File

@@ -596,7 +596,7 @@ namespace Emby.Server.Implementations.Library
}
bool hasConfiguredPassword = GetAuthenticationProvider(user).HasPassword(user).Result;
bool hasConfiguredEasyPassword = string.IsNullOrEmpty(GetLocalPasswordHash(user));
bool hasConfiguredEasyPassword = !string.IsNullOrEmpty(GetLocalPasswordHash(user));
bool hasPassword = user.Configuration.EnableLocalPassword && !string.IsNullOrEmpty(remoteEndPoint) && _networkManager.IsInLocalNetwork(remoteEndPoint) ?
hasConfiguredEasyPassword :

2
Emby.Server.Implementations/Services/StringMapTypeDeserializer.cs
View File

@@ -71,7 +71,7 @@ namespace Emby.Server.Implementations.Services
string propertyName = pair.Key;
string propertyTextValue = pair.Value;
if (string.IsNullOrEmpty(propertyTextValue)
if (propertyTextValue == null
|| !propertySetterMap.TryGetValue(propertyName, out propertySerializerEntry)
|| propertySerializerEntry.PropertySetFn == null)
{