diff options
| author | friendica <info@friendica.com> | 2013-05-10 03:37:41 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-05-10 03:37:41 -0700 |
| commit | 6f7e002922c33ef7c3a7182500415119f1c41a38 (patch) | |
| tree | b58332a40ab10d123bb24c3642c218367a2dd288 | |
| parent | eb15209cf08afe5423eccba160e302947ca13568 (diff) | |
| download | volse-hubzilla-6f7e002922c33ef7c3a7182500415119f1c41a38.tar.gz volse-hubzilla-6f7e002922c33ef7c3a7182500415119f1c41a38.tar.bz2 volse-hubzilla-6f7e002922c33ef7c3a7182500415119f1c41a38.zip | |
add db_port to setup and cli_startup - still need to set the port in mod/setup
| -rw-r--r-- | include/cli_startup.php | 4 | ||||
| -rwxr-xr-x | mod/setup.php | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/cli_startup.php b/include/cli_startup.php index 1be58d855..1d5861541 100644 --- a/include/cli_startup.php +++ b/include/cli_startup.php @@ -15,8 +15,8 @@ function cli_startup() { if(is_null($db)) { @include(".htconfig.php"); require_once('include/dba/dba_driver.php'); - $db = dba_factory($db_host, $db_user, $db_pass, $db_data); - unset($db_host, $db_user, $db_pass, $db_data); + $db = dba_factory($db_host, $db_port, $db_user, $db_pass, $db_data); + unset($db_host, $db_port, $db_user, $db_pass, $db_data); }; require_once('include/session.php'); diff --git a/mod/setup.php b/mod/setup.php index b80435f0b..059b28df9 100755 --- a/mod/setup.php +++ b/mod/setup.php @@ -36,10 +36,10 @@ function setup_post(&$a) { require_once('include/dba/dba_driver.php'); unset($db); - $db = dba_factory($dbhost, $dbuser, $dbpass, $dbdata, true); + $db = dba_factory($dbhost, $dbport, $dbuser, $dbpass, $dbdata, true); /*if(get_db_errno()) { unset($db); - $db = dba_factory($dbhost, $dbuser, $dbpass, '', true); + $db = dba_factory($dbhost, $dbport, $dbuser, $dbpass, '', true); if(! get_db_errno()) { $r = q("CREATE DATABASE '%s'", @@ -76,7 +76,7 @@ function setup_post(&$a) { // connect to db - $db = dba_factory($dbhost, $dbuser, $dbpass, $dbdata, true); + $db = dba_factory($dbhost, $dbport, $dbuser, $dbpass, $dbdata, true); $tpl = get_intltext_template('htconfig.tpl'); $txt = replace_macros($tpl,array( |