diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2014-06-24 19:34:36 +0200 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2014-06-24 19:34:36 +0200 |
| commit | b8dc9e855af2d30f33d0f90dc13d8cad0a7b3e70 (patch) | |
| tree | 718df6305bcb82c8dcb4b287a7132422e748cdfb /include/cli_startup.php | |
| parent | c2d520f1be115fb3cb5da2a35eb10146cecee8aa (diff) | |
| parent | a92fb0b04c3e6474ec48faf8e4cc65c382e89d66 (diff) | |
| download | volse-hubzilla-b8dc9e855af2d30f33d0f90dc13d8cad0a7b3e70.tar.gz volse-hubzilla-b8dc9e855af2d30f33d0f90dc13d8cad0a7b3e70.tar.bz2 volse-hubzilla-b8dc9e855af2d30f33d0f90dc13d8cad0a7b3e70.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/cli_startup.php')
| -rw-r--r-- | include/cli_startup.php | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/include/cli_startup.php b/include/cli_startup.php index d9f6ecb8e..6bd4e7520 100644 --- a/include/cli_startup.php +++ b/include/cli_startup.php @@ -1,4 +1,4 @@ -<?php +<?php /** @file */ require_once('boot.php'); @@ -14,14 +14,13 @@ 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); - unset($db_host, $db_user, $db_pass, $db_data); + require_once('include/dba/dba_driver.php'); + $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'); - load_config('config'); load_config('system'); $a->set_baseurl(get_config('system','baseurl')); |