diff --git a/src/Umbraco.Web/Routing/PublishedContentRequest.cs b/src/Umbraco.Web/Routing/PublishedContentRequest.cs index 6072137c4d..48f697ab4c 100644 --- a/src/Umbraco.Web/Routing/PublishedContentRequest.cs +++ b/src/Umbraco.Web/Routing/PublishedContentRequest.cs @@ -179,7 +179,7 @@ namespace Umbraco.Web.Routing /// /// Setting the requested content clears Template. public IPublishedContent PublishedContent - { + { get { return _publishedContent; } set { @@ -202,7 +202,7 @@ namespace Umbraco.Web.Routing EnsureWriteable(); // unless a template has been set already by the finder, - // template should be null at that point. + // template should be null at that point. // IsInternalRedirect if IsInitial, or already IsInternalRedirect var isInternalRedirect = IsInitialPublishedContent || IsInternalRedirectPublishedContent; @@ -244,7 +244,7 @@ namespace Umbraco.Web.Routing /// /// Gets value indicating whether the current published content is the initial one. /// - public bool IsInitialPublishedContent + public bool IsInitialPublishedContent { get { @@ -292,7 +292,7 @@ namespace Umbraco.Web.Routing /// /// Gets or sets the template model to use to display the requested content. /// - internal ITemplate TemplateModel + internal ITemplate TemplateModel { get { @@ -314,9 +314,9 @@ namespace Umbraco.Web.Routing /// public string TemplateAlias { - get - { - return _template == null ? null : _template.Alias; + get + { + return _template == null ? null : _template.Alias; } } @@ -346,7 +346,7 @@ namespace Umbraco.Web.Routing if (model == null) return false; - TemplateModel = model; + TemplateModel = model; return true; } @@ -379,29 +379,22 @@ namespace Umbraco.Web.Routing get { return _template != null; } } - #endregion + #endregion - #region Domain and Culture + #region Domain and Culture //TODO: Should we publicize the setter now that we are using a non-legacy entity?? /// /// Gets or sets the content request's domain. /// + /// Is a DomainAndUri object ie a standard Domain plus the fully qualified uri. For example, + /// the Domain may contain "example.com" whereas the Uri will be fully qualified eg "http://example.com/". public DomainAndUri Domain { get; internal set; } - /// - /// Gets or sets the content request's domain Uri. - /// - /// The Domain may contain "example.com" whereas the Uri will be fully qualified eg "http://example.com/". - public Uri DomainUri { get; internal set; } - /// /// Gets a value indicating whether the content request has a domain. /// - public bool HasDomain - { - get { return Domain != null; } - } + public bool HasDomain => Domain != null; private CultureInfo _culture; @@ -573,7 +566,7 @@ namespace Umbraco.Web.Routing ResponseStatusCode = code; ResponseStatusDescription = description; } - - #endregion + + #endregion } } \ No newline at end of file diff --git a/src/Umbraco.Web/Routing/PublishedContentRequestEngine.cs b/src/Umbraco.Web/Routing/PublishedContentRequestEngine.cs index 7a780f0d4d..f32f78d706 100644 --- a/src/Umbraco.Web/Routing/PublishedContentRequestEngine.cs +++ b/src/Umbraco.Web/Routing/PublishedContentRequestEngine.cs @@ -243,7 +243,6 @@ namespace Umbraco.Web.Routing _pcr.Domain = domainAndUri; _pcr.Culture = domainAndUri.Culture; - _pcr.DomainUri = domainAndUri.Uri; // fixme wtf?! // canonical? not implemented at the moment // if (...)