Changeset 20730

Timestamp:

2011/03/19 13:21:29 (13 years ago)

Author:

nanasess

bzr:base-revision:

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

bzr:committer:

Kentaro Ohkouchi <nanasess@fsm.ne.jp>

bzr:file-ids:

html/install/index.php 16809@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Findex.php

bzr:mapping-version:

v4

bzr:merge:

nanasess@fsm.ne.jp-20110319041950-ci829x93rei2mm26

bzr:repository-uuid:

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

bzr:revision-id:

nanasess@fsm.ne.jp-20110319042122-m8nbwcqm4umk5m3h

bzr:revno:

3444

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:text-revisions:

html/install/index.php nanasess@fsm.ne.jp-20110319041950-ci829x93rei2mm26

bzr:timestamp:

2011-03-19 13:21:22.546999931 +0900

bzr:user-agent:

bzr2.2.2+bzr-svn1.0.4

svn:original-date:

2011-03-19T04:21:22.547000Z

Message:

#951 (再インストールでDB初期化をしない場合、ログイン出来なくなる)

• とり急ぎ修正
• #957 は継続中

File:

• branches/version-2_5-dev/html/install/index.php (modified) (2 diffs)

branches/version-2_5-dev/html/install/index.php

@@ -512 +512 @@
     }
     $dsn = $arrDbParam['db_type']."://".$arrDbParam['db_user'].":".$arrDbParam['db_password']."@".$arrDbParam['db_server'].":".$arrDbParam['db_port']."/".$arrDbParam['db_name'];
+    if (!defined('DEFAULT_DSN')) {
+        define('DEFAULT_DSN', $dsn);
+    }
 
     $objPage->tpl_site_url = $normal_url;
@@ -517 +520 @@
     $objPage->tpl_cube_ver = ECCUBE_VERSION;
     $objPage->tpl_php_ver = phpversion();
-    $objPage->tpl_db_ver = $objDb->sfGetDBVersion($dsn);
+    $dbFactory = SC_DB_DBFactory_Ex::getInstance();
+    $objPage->tpl_db_ver = $dbFactory->sfGetDBVersion($dsn);
     $objPage->tpl_db_skip = $_POST['db_skip'];
     $objPage->tpl_mainpage = 'step4.tpl';