diff options
| author | tuscanhobbit <tuscanhobbit@users.noreply.github.com> | 2014-10-01 19:26:21 +0200 |
|---|---|---|
| committer | tuscanhobbit <tuscanhobbit@users.noreply.github.com> | 2014-10-01 19:26:21 +0200 |
| commit | 9cce852ac71fcd12970e985f1f61697333849172 (patch) | |
| tree | c40ce5543c412035ca03188f7bd9e565efb62117 /include/cli_startup.php | |
| parent | a548f644d05f330a2b70c87df821bce05007c979 (diff) | |
| parent | f19d718631675d38efca1741f46bf0916af72a65 (diff) | |
| download | volse-hubzilla-9cce852ac71fcd12970e985f1f61697333849172.tar.gz volse-hubzilla-9cce852ac71fcd12970e985f1f61697333849172.tar.bz2 volse-hubzilla-9cce852ac71fcd12970e985f1f61697333849172.zip | |
Merge from upstream
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); |