Merge branch temp8 into temp8-di2690

2018-08-29 12:15:39 +02:00
parent 2319617fed 451b58ee50
commit 31a356d98e
205 changed files with 1475 additions and 1426 deletions
--- a/src/Umbraco.Core/IO/MediaFileSystem.cs
+++ b/src/Umbraco.Core/IO/MediaFileSystem.cs
@@ -102,7 +102,7 @@ namespace Umbraco.Core.IO
                }
                catch (Exception e)
                {
-                    Logger.Error<MediaFileSystem>("Failed to delete attached file \"" + file + "\".", e);
+                    Logger.Error<MediaFileSystem>(e, "Failed to delete attached file '{File}'", file);
                }
            });
        }