[Svn-src-all:882] [version-2_5-dev 19769] #802(Web サーバーのポートを 8080 等にした場合, インストーラへリダイレクトしない)

[nanasess]

Subversion committed to /home/svn/open 19769
http://svn.ec-cube.net/open_trac/changeset/19769
┌────────────────────────────┐
│更新者　:  nanasess                                     │
│更新日時:  2010-12-27 13:45:51 +0900 (月, 27 12月 2010)│
└────────────────────────────┘

Log:
--------------------------------------------------------
#802(Web サーバーのポートを 8080 等にした場合, インストーラへリダイレクトしない)


Changed:                      [U:修正，A:追加，D:削除]
--------------------------------------------------------
U   branches/version-2_5-dev/data/Smarty/templates/admin/order/index.tpl
U   branches/version-2_5-dev/data/Smarty/templates/admin/order/status.tpl
U   branches/version-2_5-dev/data/Smarty/templates/admin/products/product_class.tpl
U   branches/version-2_5-dev/data/class/SC_Query.php
U   branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Class.php
U   branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php
U   branches/version-2_5-dev/data/class/util/SC_Utils.php
U   branches/version-2_5-dev/data/install.php
U   branches/version-2_5-dev/data/mtb_constants_init.php
U   branches/version-2_5-dev/docs/eccube-diagram.jude
U   branches/version-2_5-dev/html/install/sql/insert_data.sql
U   branches/version-2_5-dev/html/user_data/packages/admin/js/admin.js
U   branches/version-2_5-dev/html/user_data/packages/default/img/picture/img_blank.gif

変更: branches/version-2_5-dev/data/class/util/SC_Utils.php
===================================================================
--- branches/version-2_5-dev/data/class/util/SC_Utils.php	2010-12-25 11:58:13 UTC (rev 19768)
+++ branches/version-2_5-dev/data/class/util/SC_Utils.php	2010-12-27 04:45:51 UTC (rev 19769)
@@ -110,7 +110,7 @@
         } else {
             $proto = "http://";
         }
-        $host = $proto . $_SERVER['SERVER_NAME'];
+        $host = $proto . $_SERVER['SERVER_NAME'] . ':' . $_SERVER['SERVER_PORT'];
         if ($path == '/') {
             return $host . $path . $installer;
         }
@@ -154,7 +154,7 @@
         }
 
         $path = join('/', $results);
-        return $parse['scheme'] . '://' . $parse['host'] . '/' . $path;
+        return $parse['scheme'] . '://' . $parse['host'] . ':' . $parse['port'] .'/' . $path;
     }
 
     // 装飾付きエラーメッセージの表示