diff options
| author | habeascodice <habeascodice@federated.social> | 2014-10-06 08:43:29 -0700 |
|---|---|---|
| committer | habeascodice <habeascodice@federated.social> | 2014-10-06 08:43:29 -0700 |
| commit | 6b40c2cd090d1c406b3e1cd7ad135baff21bfd54 (patch) | |
| tree | a9d5b42f896384b129b8edfe5b9e8ec2b21ca21d /include/cli_startup.php | |
| parent | 79bb60aafd39fef7bc4d03eb40d33e23af5b793f (diff) | |
| parent | 34ef3fda76a924d09e77a698e38b79922b8b7f88 (diff) | |
| download | volse-hubzilla-6b40c2cd090d1c406b3e1cd7ad135baff21bfd54.tar.gz volse-hubzilla-6b40c2cd090d1c406b3e1cd7ad135baff21bfd54.tar.bz2 volse-hubzilla-6b40c2cd090d1c406b3e1cd7ad135baff21bfd54.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'include/cli_startup.php')
| -rw-r--r-- | include/cli_startup.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/cli_startup.php b/include/cli_startup.php index 6bd4e7520..f90a75cd1 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; + global $a, $db, $default_timezone; if(is_null($a)) { $a = new App; @@ -14,6 +14,10 @@ function cli_startup() { if(is_null($db)) { @include(".htconfig.php"); + + $a->timezone = ((x($default_timezone)) ? $default_timezone : 'UTC'); + date_default_timezone_set($a->timezone); + 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); |