[Svn-src-all:2797] [version-2_12-dev 21696] #1666 (create_table_*.sql 間の差異を減らす)

[Seasoft]

Subversion committed to /home/svn/open 21696
http://svn.ec-cube.net/open_trac/changeset/21696
┌────────────────────────────┐
│更新者　:  Seasoft                                      │
│更新日時:  2012-03-30 03:54:06 +0900 (金, 30  3月 2012)│
└────────────────────────────┘

Log:
--------------------------------------------------------
#1666 (create_table_*.sql 間の差異を減らす)
  * 実装誤りを修正

Changed:                      [U:修正，A:追加，D:削除]
--------------------------------------------------------
U   branches/version-2_12-dev/html/install/index.php

変更: branches/version-2_12-dev/html/install/index.php
===================================================================
--- branches/version-2_12-dev/html/install/index.php	2012-03-29 18:53:21 UTC (rev 21695)
+++ branches/version-2_12-dev/html/install/index.php	2012-03-29 18:54:06 UTC (rev 21696)
@@ -1072,12 +1072,12 @@
         'username'  => $arrRet['db_user'],
         'password'  => $arrRet['db_password'],
         'database'  => $arrRet['db_name'],
+        'port'      => $arrRet['db_port'],
     );
 
     // 文字列形式の DSN との互換処理
-    if ($arrRet['db_server'] !== '+') {
+    if (strlen($arrRet['db_server']) >= 1 && $arrRet['db_server'] !== '+') {
         $arrDsn['hostspec'] = $arrRet['db_server'];
-        $arrDsn['port']     = $arrRet['db_port'];
     }
 
     return $arrDsn;