Format is now setting FormatFlags.HasUriCharactersToNormalize.

diff --git a/mcs/class/System/System/UriHelper.cs b/mcs/class/System/System/UriHelper.cs
index 17fc1d1e800493200977b99fe13811008de2ee2b..b2ca9463b0b03ae32f76ac19e253b7ea2061d295 100644 (file)
--- a/mcs/class/System/System/UriHelper.cs
+++ b/mcs/class/System/System/UriHelper.cs
@@ -169,11 +169,7 @@ namespace System {
 
                internal static string FormatRelative (string str, string schemeName, UriFormat uriFormat)
                {
-                       var formatFlags = FormatFlags.None;
-                       if (HasCharactersToNormalize (str))
-                               formatFlags |= FormatFlags.HasUriCharactersToNormalize;
-
-                       return Format (str, schemeName, UriKind.Relative, UriComponents.Path, uriFormat, formatFlags);
+                       return Format (str, schemeName, UriKind.Relative, UriComponents.Path, uriFormat, FormatFlags.None);
                }
 
                private static string Format (string str, string schemeName, UriKind uriKind,
@@ -183,7 +179,7 @@ namespace System {
                                return "";
 
                        if (UriHelper.HasCharactersToNormalize (str))
-                               formatFlags |= UriHelper.FormatFlags.HasComponentCharactersToNormalize;
+                               formatFlags |= UriHelper.FormatFlags.HasComponentCharactersToNormalize | FormatFlags.HasUriCharactersToNormalize;
 
                        if (component == UriComponents.Fragment && UriHelper.HasPercentage (str))
                                formatFlags |= UriHelper.FormatFlags.HasFragmentPercentage;