修正安装时的端口判断

minisin · Oct 12, 2014 · f1726cf · f1726cf
1 parent 1e69fdb
commit f1726cf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/install.php b/install.php
@@ -67,7 +67,7 @@
     }
 
     $parts = parse_url($_SERVER['HTTP_REFERER']);
-	if (!empty($parts['port']) && $parts['port'] != 80 && !Typecho_Common::isAppEngine()) {
+	if (!empty($parts['port']) && !Typecho_Common::isAppEngine()) {
         $parts['host'] = "{$parts['host']}:{$parts['port']}";
     }
 

diff --git a/var/Typecho/Request.php b/var/Typecho/Request.php
@@ -219,8 +219,9 @@ public static function getUrlPrefix()
     {
         if (empty(self::$_urlPrefix)) {
             self::$_urlPrefix = (self::isSecure() ? 'https' : 'http') 
-                . '://' . (isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : $_SERVER['SERVER_NAME'])
-                . (in_array($_SERVER['SERVER_PORT'], array(80, 443)) ? '' : ':' . $_SERVER['SERVER_PORT']);
+                . '://' . (isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : 
+                    ($_SERVER['SERVER_NAME'] . (in_array($_SERVER['SERVER_PORT'], array(80, 443)) ? '' : ':' . $_SERVER['SERVER_PORT']))
+                );
         }
 
         return self::$_urlPrefix;