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

Merge remote-tracking branch 'origin/6.2.0' into 7.0.0-member-editor-wip

Browse Source 
Conflicts:
	src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadContent.cs
This commit is contained in:
Shannon
2013-09-30 13:52:01 +10:00
parent cf6ecf5bc9 4df79ce55b
commit bbdce28951
14 changed files with 452 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Web/Routing/PublishedContentRequestEngine.cs
View File

@@ -28,11 +28,13 @@ namespace Umbraco.Web.Routing
/// <param name="pcr">The content request.</param>
public PublishedContentRequestEngine(PublishedContentRequest pcr)
{
if (pcr == null) throw new ArgumentException("pcr is null.");
_pcr = pcr;
_routingContext = pcr.RoutingContext;
var umbracoContext = _routingContext.UmbracoContext;
if (_routingContext == null) throw new ArgumentException("pcr.RoutingContext is null.");
var umbracoContext = _routingContext.UmbracoContext;
if (umbracoContext == null) throw new ArgumentException("pcr.RoutingContext.UmbracoContext is null.");
if (umbracoContext.RoutingContext != _routingContext) throw new ArgumentException("RoutingContext confusion.");
// no! not set yet.