Merge with 6.0.1

This commit is contained in:
Shannon Deminick
2013-02-27 23:20:34 +06:00
16 changed files with 156 additions and 99 deletions

View File

@@ -32,8 +32,8 @@ namespace Umbraco.Tests.Routing
_module = new UmbracoModule();
SettingsForTests.ConfigurationStatus = UmbracoVersion.Current.ToString(3);
SettingsForTests.ReservedPaths = "~/umbraco,~/install/";
SettingsForTests.ReservedUrls = "~/config/splashes/booting.aspx,~/install/default.aspx,~/config/splashes/noNodes.aspx,~/VSEnterpriseHelper.axd";
//SettingsForTests.ReservedPaths = "~/umbraco,~/install/";
//SettingsForTests.ReservedUrls = "~/config/splashes/booting.aspx,~/install/default.aspx,~/config/splashes/noNodes.aspx,~/VSEnterpriseHelper.axd";
//create the not found handlers config
using (var sw = File.CreateText(Umbraco.Core.IO.IOHelper.MapPath(Umbraco.Core.IO.SystemFiles.NotFoundhandlersConfig, false)))