Merge with 6.0.4

2013-04-02 22:39:39 +06:00
parent 83d05bd01c b9d7f0c5a5
commit a7e939e71f
30 changed files with 809 additions and 328 deletions
--- a/src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs
+++ b/src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs
@@ -18,7 +18,7 @@ namespace Umbraco.Tests.PublishedContent
        public override void Initialize()
        {
            base.Initialize();
-
+            
            UmbracoSettings.SettingsFilePath = Core.IO.IOHelper.MapPath(Core.IO.SystemDirectories.Config + Path.DirectorySeparatorChar, false);

            //need to specify a custom callback for unit tests