Merge branch '6.0.7' into 6.1.2

2013-06-28 13:30:04 +02:00
parent d89539a437 f809dec874
commit b0f4cb7d02
5 changed files with 90 additions and 10 deletions
--- a/src/Umbraco.Core/Persistence/RepositoryFactory.cs
+++ b/src/Umbraco.Core/Persistence/RepositoryFactory.cs
@@ -43,7 +43,7 @@ namespace Umbraco.Core.Persistence
                uow,
                RuntimeCacheProvider.Current,
                CreateContentTypeRepository(uow),
-                CreateTemplateRepository(uow));
+                CreateTemplateRepository(uow)) { EnsureUniqueNaming = Umbraco.Core.Configuration.UmbracoSettings.EnsureUniqueNaming };
        }

        public virtual IContentTypeRepository CreateContentTypeRepository(IDatabaseUnitOfWork uow)