yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev-v7' into temp8

Browse Source 
# Conflicts:
#	src/Umbraco.Core/StringExtensions.cs
#	src/Umbraco.Web/Models/Mapping/UserModelMapper.cs
This commit is contained in:
Sebastiaan Janssen
2019-01-29 13:11:03 +01:00
parent 19686496e6 2c3a2b29b2
commit 7a778d4c42
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Core/StringExtensions.cs
View File

@@ -737,7 +737,8 @@ namespace Umbraco.Core
/// </summary>
/// <param name="stringToConvert">Refers to itself</param>
/// <returns>The MD5 hashed string</returns>
public static string ToMd5(this string stringToConvert)
[Obsolete("Please use the GenerateHash method instead. This may be removed in future versions")]
internal static string ToMd5(this string stringToConvert)
{
return stringToConvert.GenerateHash("MD5");
}
@@ -747,7 +748,8 @@ namespace Umbraco.Core
/// </summary>
/// <param name="stringToConvert">refers to itself</param>
/// <returns>The SHA1 hashed string</returns>
public static string ToSHA1(this string stringToConvert)
[Obsolete("Please use the GenerateHash method instead. This may be removed in future versions")]
internal static string ToSHA1(this string stringToConvert)
{
return stringToConvert.GenerateHash("SHA1");
}