[BugFix] Rootnode resolving bug fixed ([#69](#69))

kipusoep · Mar 21, 2015 · f2b323d · f2b323d
1 parent a2af5ec
commit f2b323d
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 38 deletions.
diff --git a/Extensions/INodeExtensions.cs b/Extensions/INodeExtensions.cs
@@ -8,40 +8,40 @@
 
 namespace InfoCaster.Umbraco.UrlTracker.Extensions
 {
-	public static class INodeExtensions
-	{
-		/// <summary>
-		/// Retrieve the root node
-		/// </summary>
-		/// <param name="node">The current node</param>
-		/// <returns>The root node</returns>
-		public static Node GetRootNode(this INode node)
-		{
-			if (node == null)
-				throw new ArgumentNullException("node");
+    public static class INodeExtensions
+    {
+        /// <summary>
+        /// Retrieve the root node
+        /// </summary>
+        /// <param name="node">The current node</param>
+        /// <returns>The root node</returns>
+        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;
+        }
 
-		/// <summary>
-		/// Retreive the closest ancestor or self with a host name set, or the root node if no hostnames are set
-		/// </summary>
-		/// <param name="node">The current node</param>
-		/// <returns>The closest ancestor or self with a host name set, or the root node if no hostnames are set</returns>
-		public static Node GetDomainRootNode(this INode node)
-		{
-			if (node == null)
-				throw new ArgumentNullException("node");
+        /// <summary>
+        /// Retreive the closest ancestor or self with a host name set, or the root node if no hostnames are set
+        /// </summary>
+        /// <param name="node">The current node</param>
+        /// <returns>The closest ancestor or self with a host name set, or the root node if no hostnames are set</returns>
+        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;
+        }
+    }
 }
diff --git 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
@@ -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
@@ -86,6 +86,12 @@
             </div>
             <div class="tab-pane" id="changeLog">
                 <ul>
+                    <li>
+                        3.6 [2015/03/21]
+                        <ul>
+                            <li>[BugFix] Rootnode resolving bug fixed (<a target="_blank" href="https://github.com/kipusoep/UrlTracker/issues/69">#69</a>)</li>
+                        </ul>
+                    </li>
                     <li>
                         3.5 [2015/02/20]
                         <ul>

diff --git a/UrlTracker.csproj b/UrlTracker.csproj
@@ -45,22 +45,28 @@
   <ItemGroup>
     <Reference Include="businesslogic">
       <HintPath>lib\businesslogic.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="ClientDependency.Core, Version=1.7.0.1, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>lib\ClientDependency.Core.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="cms">
       <HintPath>lib\cms.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="controls">
       <HintPath>lib\controls.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="interfaces">
       <HintPath>lib\interfaces.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="log4net">
       <HintPath>lib\log4net.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -96,12 +102,15 @@
     <Reference Include="System.Xml.Linq" />
     <Reference Include="umbraco">
       <HintPath>lib\umbraco.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="Umbraco.Core">
       <HintPath>lib\Umbraco.Core.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="umbraco.DataLayer">
       <HintPath>lib\umbraco.DataLayer.dll</HintPath>
+      <Private>False</Private>
     </Reference>
   </ItemGroup>
   <ItemGroup>