Changeset 19769 for branches/version-2_5-dev/data/class/util/SC_Utils.php

Timestamp:

2010/12/27 13:45:51 (15 years ago)

Author:

nanasess

bzr:base-revision:

svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_5-dev:19768

bzr:committer:

Kentaro Ohkouchi <[email protected]>

bzr:file-ids:

data/Smarty/templates/admin/order/index.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Forder%2Findex.tpl
data/Smarty/templates/admin/order/status.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Forder%2Fstatus.tpl
data/Smarty/templates/admin/products/product_class.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fproducts%2Fproduct_class.tpl
data/class/SC_Query.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2FSC_Query.php
data/class/pages/admin/products/LC_Page_Admin_Products_Class.php 15481@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fproducts%2FLC_Page_Admin_Products_Class.php
data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php 15559@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fproducts%2FLC_Page_Admin_Products_ProductClass.php
data/class/util/SC_Utils.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Futil%2FSC_Utils.php
data/install.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Finstall.php
data/mtb_constants_init.php 16505@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fmtb_constants_init.php
docs/eccube-diagram.jude eccubediagram.jude-20101102081620-jpq1fqmox6ocmuj3-2
html/install/sql/insert_data.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Finsert_data.sql
html/user_data/packages/admin/js/admin.js 18900@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_5-dev%2Fhtml%2Fuser_data%2Fpackages%2Fadmin%2Fjs%2Fadmin.js
html/user_data/packages/default/img/picture/img_blank.gif img_blank.gif-20101221050320-jwgxp5c3ioqwis6x-1

bzr:mapping-version:

v4

bzr:merge:

[email protected]

bzr:repository-uuid:

1e3b908f-19a9-db11-a64c-001125224ba8

bzr:revision-id:

[email protected]

bzr:revno:

2498

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:text-revisions:

data/Smarty/templates/admin/order/index.tpl [email protected]
data/Smarty/templates/admin/order/status.tpl [email protected]
data/Smarty/templates/admin/products/product_class.tpl [email protected]
data/class/SC_Query.php [email protected]
data/class/pages/admin/products/LC_Page_Admin_Products_Class.php [email protected]
data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php [email protected]
data/class/util/SC_Utils.php [email protected]
data/mtb_constants_init.php [email protected]
docs/eccube-diagram.jude [email protected]
html/install/sql/insert_data.sql [email protected]
html/user_data/packages/admin/js/admin.js [email protected]
html/user_data/packages/default/img/picture/img_blank.gif [email protected]

bzr:timestamp:

2010-12-27 13:45:46.430999994 +0900

bzr:user-agent:

bzr2.2.1+bzr-svn1.0.4

svn:original-date:

2010-12-27T04:45:46.431000Z

Message:

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

File:

• branches/version-2_5-dev/data/class/util/SC_Utils.php (modified) (2 diffs)

branches/version-2_5-dev/data/class/util/SC_Utils.php

@@ -111 +111 @@
             $proto = "http://";
         }
-        $host = $proto . $_SERVER['SERVER_NAME'];
+        $host = $proto . $_SERVER['SERVER_NAME'] . ':' . $_SERVER['SERVER_PORT'];
         if ($path == '/') {
             return $host . $path . $installer;
@@ -155 +155 @@
 
         $path = join('/', $results);
-        return $parse['scheme'] . '://' . $parse['host'] . '/' . $path;
+        return $parse['scheme'] . '://' . $parse['host'] . ':' . $parse['port'] .'/' . $path;
     }