Removes umbraco settings: ImageTagAllowedAttributes, UploadAllowDirectories, ensureUniqueNaming, ImageTagAllowedAttributes, ScriptEditorDisable, ScriptFolderPath, UploadAllowDirectories

src/Umbraco.Core/IO/MediaPathSchemes/OriginalMediaPathScheme.cs

@@ -31,7 +31,7 @@ namespace Umbraco.Core.IO.MediaPathSchemes
                 // prevpath should be "<int>/<filename>" OR "<int>-<filename>"
                 // and we want to reuse the "<int>" part, so try to find it
 
-                var sep = Current.Configs.Settings().Content.UploadAllowDirectories ? "/" : "-";
+                const string sep = "/";
                 var pos = previous.IndexOf(sep, StringComparison.Ordinal);
                 var s = pos > 0 ? previous.Substring(0, pos) : null;
 
@@ -45,9 +45,7 @@ namespace Umbraco.Core.IO.MediaPathSchemes
             if (directory == null)
                 throw new InvalidOperationException("Cannot use a null directory.");
 
-            return Current.Configs.Settings().Content.UploadAllowDirectories
-                ? Path.Combine(directory, filename).Replace('\\', '/')
-                : directory + "-" + filename;
+            return Path.Combine(directory, filename).Replace('\\', '/');
         }
 
         /// <inheritdoc />