yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/7.0.0' into 7.0.0--property-editor-guid-to-alias

Browse Source 
Conflicts:
	src/Umbraco.Core/Configuration/LegacyUmbracoSettings.cs
	src/Umbraco.Core/Persistence/Migrations/Syntax/Alter/Expressions/AlterColumnExpression.cs
	src/Umbraco.Core/PropertyEditors/TinyMcePropertyEditorValueConverter.cs
	src/Umbraco.Core/XmlHelper.cs
	src/Umbraco.Tests/ObjectExtensionsTests.cs
	src/Umbraco.Web/PropertyEditors/RteMacroRenderingPropertyEditorValueConverter.cs
	src/Umbraco.Web/Routing/DefaultUrlProvider.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/macro.cs
This commit is contained in:
Shannon
2013-09-17 00:27:17 +10:00
parent 86a5d16e25 bb641c937c
commit 371b1817ea
130 changed files with 2785 additions and 1282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Umbraco.Web/Routing/DefaultUrlProvider.cs
View File

@@ -111,13 +111,6 @@ namespace Umbraco.Web.Routing
: UrlProviderMode.Auto;
}
if (mode == UrlProviderMode.AutoLegacy)
{
mode = UmbracoConfiguration.Current.UmbracoSettings.RequestHandler.UseDomainPrefixes
? UrlProviderMode.Absolute
: UrlProviderMode.Auto;
}
if (domainUri == null) // no domain was found
{
if (current == null)

2
src/Umbraco.Web/Routing/LegacyRequestInitializer.cs
View File

@@ -27,7 +27,7 @@ namespace Umbraco.Web.Routing
// legacy - umbOriginalUrl used by presentation/umbraco/urlRewriter/UrlRewriterFormWriter which handles <form action="..."
// legacy - umbOriginalUrl also in Umbraco's back-end!
_httpContext.Items["umbOriginalUrl"] = uri.AbsolutePath;
// legacy - umbPage used by default.aspx to get the "clean url"... whatever... fixme - we prob. don't want it anymore
// legacy - umbPage used by default.aspx to get the "clean url"... whatever...
_httpContext.Items["UmbPage"] = uri.AbsolutePath;
// legacy - virtualUrl used by presentation/template.cs to handle <form action="..."
// legacy - virtualUrl used by presentation/umbraco/urlRewriter/UrlRewriterFormWriter which handles <form action="..." too