改进Url类的parseDomain方法

2026-07-01 12:42:48 +08:00 · 2016-08-24 12:39:23 +08:00
parent 242c8bf7c6
commit 5fcb550c2c
1 changed files with 7 additions and 2 deletions
--- a/library/think/Url.php
+++ b/library/think/Url.php
@@ -209,8 +209,13 @@ class Url
                    }
                }
            }
-        } else {
-            $domain .= strpos($domain, '.') ? '' : strstr($request->host(), '.');
+        } elseif (!strpos($domain, '.')) {
+            $rootDomain = Config::get('url_domain_root');
+            if (empty($rootDomain)) {
+                $host       = $request->host();
+                $rootDomain = substr_count($host, '.') > 1 ? substr(strstr($host, '.'), 1) : $host;
+            }
+            $domain .= '.' . $rootDomain;
        }
        return ($request->isSsl() ? 'https://' : 'http://') . $domain;
    }