FIX - i18n.LanguageTag.ExtractLangTagFromUrl returns/outputs incorrec…

…t values when passed an absolute url
turquoiseowl · Apr 22, 2020 · 395ff75 · 395ff75
1 parent 1752a39
commit 395ff75
Show file tree

Hide file tree

Showing 2 changed files with 153 additions and 125 deletions.
diff --git a/src/i18n.Domain/Concrete/LanguageTag.cs b/src/i18n.Domain/Concrete/LanguageTag.cs
@@ -512,15 +512,17 @@ public static string ExtractLangTagFromUrl(string url, UriKind uriKind, out stri
                 Uri uri;
                 if (Uri.TryCreate(url, UriKind.Absolute, out uri)) {
                     UriBuilder ub = new UriBuilder(url);
-                    string urlNew = ExtractLangTagFromUrl(ub.Path, UriKind.Relative, out urlPatched);
+                    string strPatchedPath = null;
+                    string langtag = ExtractLangTagFromUrl(ub.Path, UriKind.Relative, out strPatchedPath);
                    // Match?
-                    if (urlNew != null) {
-                        ub.Path = urlNew;
-                        return ub.Uri.ToString(); // Go via Uri to avoid port 80 being added.
+                    if (langtag != null) {
+                        ub.Path = strPatchedPath;
+                        urlPatched = ub.Uri.ToString(); // Go via Uri to avoid port 80 being added.
                     }
                    // No match.
-                    urlPatched = url;
-                    return null;
+                    else {
+                        urlPatched = url; }
+                    return langtag;
                 }
             }