harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add db_port to setup and cli_startup - still need to set the port in mod/setup

Browse Source
This commit is contained in:
friendica 2013-05-10 03:37:41 -07:00
parent eb15209cf0
commit 6f7e002922
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/cli_startup.php
View File

@ -15,8 +15,8 @@ function cli_startup() {
if(is_null($db)) { if(is_null($db)) {
@include(".htconfig.php"); @include(".htconfig.php");
require_once('include/dba/dba_driver.php'); require_once('include/dba/dba_driver.php');
$db = dba_factory($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_user, $db_pass, $db_data); unset($db_host, $db_port, $db_user, $db_pass, $db_data);
}; };
require_once('include/session.php'); require_once('include/session.php');

6
mod/setup.php
View File

@ -36,10 +36,10 @@ function setup_post(&$a) {
require_once('include/dba/dba_driver.php'); require_once('include/dba/dba_driver.php');
unset($db); unset($db);
$db = dba_factory($dbhost, $dbuser, $dbpass, $dbdata, true); $db = dba_factory($dbhost, $dbport, $dbuser, $dbpass, $dbdata, true);
/*if(get_db_errno()) { /*if(get_db_errno()) {
unset($db); unset($db);
$db = dba_factory($dbhost, $dbuser, $dbpass, '', true); $db = dba_factory($dbhost, $dbport, $dbuser, $dbpass, '', true);
if(! get_db_errno()) { if(! get_db_errno()) {
$r = q("CREATE DATABASE '%s'", $r = q("CREATE DATABASE '%s'",
@ -76,7 +76,7 @@ function setup_post(&$a) {
// connect to db // 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'); $tpl = get_intltext_template('htconfig.tpl');
$txt = replace_macros($tpl,array( $txt = replace_macros($tpl,array(