From 4c20441c4ec745408fd9ed1072b0cfa42fd701eb Mon Sep 17 00:00:00 2001 From: Shannon Date: Wed, 5 Aug 2015 17:17:49 +0200 Subject: [PATCH] Fixes: U4-6915 Txt Starter Kit install fails on 7.3.0 beta3 --- src/Umbraco.Core/Models/Stylesheet.cs | 2 +- .../Persistence/Repositories/StylesheetRepository.cs | 7 ++++++- src/umbraco.cms/businesslogic/web/StyleSheet.cs | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/Umbraco.Core/Models/Stylesheet.cs b/src/Umbraco.Core/Models/Stylesheet.cs index 586c5915b2..ca203d835d 100644 --- a/src/Umbraco.Core/Models/Stylesheet.cs +++ b/src/Umbraco.Core/Models/Stylesheet.cs @@ -17,7 +17,7 @@ namespace Umbraco.Core.Models public class Stylesheet : File { public Stylesheet(string path) - : base(path) + : base(path.EnsureEndsWith(".css")) { InitializeProperties(); } diff --git a/src/Umbraco.Core/Persistence/Repositories/StylesheetRepository.cs b/src/Umbraco.Core/Persistence/Repositories/StylesheetRepository.cs index 67986eebcc..f4d7dcda29 100644 --- a/src/Umbraco.Core/Persistence/Repositories/StylesheetRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/StylesheetRepository.cs @@ -25,6 +25,8 @@ namespace Umbraco.Core.Persistence.Repositories public override Stylesheet Get(string id) { + id = id.EnsureEndsWith(".css"); + if (FileSystem.FileExists(id) == false) { return null; @@ -63,7 +65,10 @@ namespace Umbraco.Core.Persistence.Repositories public override IEnumerable GetAll(params string[] ids) { //ensure they are de-duplicated, easy win if people don't do this as this can cause many excess queries - ids = ids.Distinct().ToArray(); + ids = ids + .Select(x => x.EnsureEndsWith(".css")) + .Distinct() + .ToArray(); if (ids.Any()) { diff --git a/src/umbraco.cms/businesslogic/web/StyleSheet.cs b/src/umbraco.cms/businesslogic/web/StyleSheet.cs index f43d5698df..e7e64a5f07 100644 --- a/src/umbraco.cms/businesslogic/web/StyleSheet.cs +++ b/src/umbraco.cms/businesslogic/web/StyleSheet.cs @@ -225,7 +225,7 @@ namespace umbraco.cms.businesslogic.web public static StyleSheet GetByName(string name) { - var found = ApplicationContext.Current.Services.FileService.GetStylesheetByName(name.EnsureEndsWith(".css")); + var found = ApplicationContext.Current.Services.FileService.GetStylesheetByName(name); if (found == null) return null; return new StyleSheet(found); }