diff --git a/Extensions/INodeExtensions.cs b/Extensions/INodeExtensions.cs index be76a6b..c7b795b 100644 --- a/Extensions/INodeExtensions.cs +++ b/Extensions/INodeExtensions.cs @@ -8,40 +8,40 @@ namespace InfoCaster.Umbraco.UrlTracker.Extensions { - public static class INodeExtensions - { - /// - /// Retrieve the root node - /// - /// The current node - /// The root node - public static Node GetRootNode(this INode node) - { - if (node == null) - throw new ArgumentNullException("node"); + public static class INodeExtensions + { + /// + /// Retrieve the root node + /// + /// The current node + /// The root node + public static Node GetRootNode(this INode node) + { + if (node == null) + throw new ArgumentNullException("node"); - INode parent = node; + INode parent = node; - while (parent != null) - { - node = parent; - parent = node.Parent; - } + while (parent != null) + { + node = parent; + parent = node.Parent; + } - return (Node)node; - } + return (Node)node; + } - /// - /// Retreive the closest ancestor or self with a host name set, or the root node if no hostnames are set - /// - /// The current node - /// The closest ancestor or self with a host name set, or the root node if no hostnames are set - public static Node GetDomainRootNode(this INode node) - { - if (node == null) - throw new ArgumentNullException("node"); + /// + /// Retreive the closest ancestor or self with a host name set, or the root node if no hostnames are set + /// + /// The current node + /// The closest ancestor or self with a host name set, or the root node if no hostnames are set + public static Node GetDomainRootNode(this INode node) + { + if (node == null) + throw new ArgumentNullException("node"); - INode parent = node; + INode parent = node; INode deepParent = node; INode deepNode = node; while (parent != null) @@ -67,13 +67,14 @@ public static Node GetDomainRootNode(this INode node) } } - if (((Node)deepNode).Parent.Id == node.Id) - { - // if the found node is a child of the normal root, then use this one... - node = deepNode; - } + // I don't know what the purpose is, but it contains a bug (https://github.com/kipusoep/UrlTracker/issues/69) - Stefan Kip + //if (((Node)deepNode).Parent.Id == node.Id) + //{ + // // if the found node is a child of the normal root, then use this one... + // node = deepNode; + //} - return (Node)node; - } - } + return (Node)node; + } + } } \ No newline at end of file diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index 19a43f2..e494f08 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -30,7 +30,7 @@ // Build Number // Revision // -[assembly: AssemblyVersion("3.5.*")] +[assembly: AssemblyVersion("3.6.*")] // SQL [assembly: WebResource("InfoCaster.Umbraco.UrlTracker.SQL.MicrosoftSqlServer.create-table-1.sql", "text/plain")] diff --git a/README.md b/README.md index 864794b..84299a0 100644 --- a/README.md +++ b/README.md @@ -46,6 +46,8 @@ Set to true to disable tracking not found (404) requests. Set to false to disable appending a port number to redirect URLs ## Changelog ## +* 3.6 [2015/03/21] + * [BugFix] Rootnode resolving bug fixed ([#69](https://github.com/kipusoep/UrlTracker/issues/69)) * 3.5 [2015/02/20] * [BugFix] Date in the changelog of v3.4 was wrong * [BugFix] Manual redirects not working with root set to / ([#62](https://github.com/kipusoep/UrlTracker/issues/62)) diff --git a/UI/UrlTrackerInfo.aspx b/UI/UrlTrackerInfo.aspx index b8ed547..c7aa807 100644 --- a/UI/UrlTrackerInfo.aspx +++ b/UI/UrlTrackerInfo.aspx @@ -86,6 +86,12 @@