From ea3940c4b0b8232e2de0771811b9f90ade9ee45f Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 25 Feb 2013 17:09:40 -0800 Subject: start formatting for Doxygen --- include/cli_startup.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/cli_startup.php') diff --git a/include/cli_startup.php b/include/cli_startup.php index d9f6ecb8e..863f97d7c 100644 --- a/include/cli_startup.php +++ b/include/cli_startup.php @@ -1,4 +1,4 @@ - Date: Mon, 22 Apr 2013 20:02:21 -0700 Subject: db abstraction layer --- include/cli_startup.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/cli_startup.php') diff --git a/include/cli_startup.php b/include/cli_startup.php index 863f97d7c..1be58d855 100644 --- a/include/cli_startup.php +++ b/include/cli_startup.php @@ -14,8 +14,8 @@ function cli_startup() { if(is_null($db)) { @include(".htconfig.php"); - require_once("dba.php"); - $db = new dba($db_host, $db_user, $db_pass, $db_data); + 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); }; -- cgit v1.2.3 From 6f7e002922c33ef7c3a7182500415119f1c41a38 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 10 May 2013 03:37:41 -0700 Subject: add db_port to setup and cli_startup - still need to set the port in mod/setup --- include/cli_startup.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/cli_startup.php') 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'); -- cgit v1.2.3 From f835737cb7f8174b69145750be11fe4b896e8820 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 21 Jun 2013 21:36:48 -0700 Subject: fix some anomolies in config functions --- include/cli_startup.php | 1 - 1 file changed, 1 deletion(-) (limited to 'include/cli_startup.php') diff --git a/include/cli_startup.php b/include/cli_startup.php index 1d5861541..6bd4e7520 100644 --- a/include/cli_startup.php +++ b/include/cli_startup.php @@ -21,7 +21,6 @@ function cli_startup() { require_once('include/session.php'); - load_config('config'); load_config('system'); $a->set_baseurl(get_config('system','baseurl')); -- cgit v1.2.3