diff options
| author | redmatrix <git@macgirvin.com> | 2016-05-24 17:54:45 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-05-24 17:54:45 -0700 |
| commit | 516c43ba154dc43ec0ef6135fb0a9732d0185a6f (patch) | |
| tree | 9e8fcfbd22f6ad8013fd48ec60090be7ccf73d11 /include/cli_startup.php | |
| parent | 84ba6393ad32406a9875044aef2d031c7d0d7a46 (diff) | |
| download | volse-hubzilla-516c43ba154dc43ec0ef6135fb0a9732d0185a6f.tar.gz volse-hubzilla-516c43ba154dc43ec0ef6135fb0a9732d0185a6f.tar.bz2 volse-hubzilla-516c43ba154dc43ec0ef6135fb0a9732d0185a6f.zip | |
more work associated with DBA and index.php shuffle
Diffstat (limited to 'include/cli_startup.php')
| -rw-r--r-- | include/cli_startup.php | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/include/cli_startup.php b/include/cli_startup.php index b89d5f1bb..1436fe1ef 100644 --- a/include/cli_startup.php +++ b/include/cli_startup.php @@ -6,7 +6,7 @@ require_once('boot.php'); function cli_startup() { - global $a, $db, $default_timezone; + global $default_timezone; if(is_null($a)) { $a = new miniApp; @@ -14,21 +14,19 @@ function cli_startup() { App::init(); - if(! DBA::$connected) { - @include(".htconfig.php"); + @include(".htconfig.php"); - $a->convert(); + $a->convert(); - if(! defined('UNO')) - define('UNO', 0); + if(! defined('UNO')) + define('UNO', 0); - App::$timezone = ((x($default_timezone)) ? $default_timezone : 'UTC'); - date_default_timezone_set(App::$timezone); + App::$timezone = ((x($default_timezone)) ? $default_timezone : 'UTC'); + date_default_timezone_set(App::$timezone); - require_once('include/dba/dba_driver.php'); - $db = DBA::dba_factory($db_host, $db_port, $db_user, $db_pass, $db_data, $db_type); - unset($db_host, $db_port, $db_user, $db_pass, $db_data, $db_type); - }; + require_once('include/dba/dba_driver.php'); + DBA::dba_factory($db_host, $db_port, $db_user, $db_pass, $db_data, $db_type); + unset($db_host, $db_port, $db_user, $db_pass, $db_data, $db_type); App::$session = new Zotlabs\Web\Session(); App::$session->init(); |