Merge remote-tracking branch 'origin/temp8' into feature/IContentType-removale-from-IContent

# Conflicts:
#	src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs
This commit is contained in:
Bjarke Berg
2019-02-01 12:52:20 +01:00
1566 changed files with 18277 additions and 26409 deletions

View File

@@ -85,7 +85,7 @@ namespace Umbraco.Core
#endregion
/// <summary>
/// Removes characters that are not valide XML characters from all entity properties
/// Removes characters that are not valid XML characters from all entity properties
/// of type string. See: http://stackoverflow.com/a/961504/5018
/// </summary>
/// <returns></returns>
@@ -173,7 +173,7 @@ namespace Umbraco.Core
// get a safe & clean filename
filename = IOHelper.SafeFileName(filename);
if (string.IsNullOrWhiteSpace(filename)) return;
filename = filename.ToLower(); // fixme - er... why?
filename = filename.ToLower();
SetUploadFile(content,contentTypeService, propertyTypeAlias, filename, filestream, culture, segment);
}