Corrected port number issue in slugs display

--HG--
branch : dev

src/Orchard.Web/Core/Common/Views/EditorTemplates/Parts/Common.Routable.ascx

@@ -10,7 +10,7 @@
     <%=Html.TextBoxFor(m => m.Title, new { @class = "large text" }) %>
 </fieldset>
 <fieldset class="permalink">
-    <label class="sub" for="Slug"><%=_Encoded("Permalink")%><br /><span><%=Html.Encode(Request.Url.ToRootString()) %>/<%=Html.Encode(Model.RoutableAspect.ContentItemBasePath) %></span></label>
+    <label class="sub" for="Slug"><%=_Encoded("Permalink")%><br /><span><%=Html.Encode(Request.ToRootUrlString())%>/<%=Html.Encode(Model.RoutableAspect.ContentItemBasePath) %></span></label>
     <span><%=Html.TextBoxFor(m => m.Slug, new { @class = "text" })%></span>
 </fieldset>
 <% using (this.Capture("end-of-page-scripts")) { %>

src/Orchard/Orchard.Framework.csproj

@@ -418,7 +418,7 @@
     <Compile Include="Utility\Extensions\ReadOnlyCollectionExtensions.cs" />
     <Compile Include="Utility\Extensions\RouteValueDictionaryExtensions.cs" />
     <Compile Include="Utility\Extensions\StringExtensions.cs" />
-    <Compile Include="Utility\Extensions\UriExtensions.cs" />
+    <Compile Include="Utility\Extensions\HttpRequestExtensions.cs" />
     <Compile Include="Utility\Position.cs" />
     <Compile Include="Utility\Reflect.cs" />
     <Compile Include="Utility\ReflectOn.cs" />

src/Orchard/Utility/Extensions/HttpRequestExtensions.cs

@@ -0,0 +1,13 @@
+using System.Web;
+
+namespace Orchard.Utility.Extensions {
+    public static class HttpRequestExtensions {
+        /// <summary>
+        /// Returns the root part of a request. 
+        /// </summary>
+        /// <remarks>Prevents port number issues by using the client requested host</remarks>
+        public static string ToRootUrlString(this HttpRequest request) {
+            return string.Format("{0}://{1}", request.Url.Scheme, request.Headers["Host"]);
+        }
+    }
+}

src/Orchard/Utility/Extensions/UriExtensions.cs

@@ -1,9 +0,0 @@
-using System;
-
-namespace Orchard.Utility.Extensions {
-    public static class UriExtensions {
-        public static string ToRootString(this Uri uri) {
-            return string.Format("{0}://{1}{2}", uri.Scheme, uri.Host, uri.Port != 80 ? ":" + uri.Port : "");
-        }
-    }
-}