revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-11-22 23:02:42 +01:00
Code Issues Releases Wiki Activity

Minor, fix initialization order so config initialization does not fatal on phlog().

Browse source
This commit is contained in:
epriestley 2013-01-18 11:29:08 -08:00
parent 00f730d6e9
commit 9e2ec82094
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/infrastructure/env/PhabricatorEnv.php vendored
View file

@ -103,10 +103,10 @@ final class PhabricatorEnv {
private static function initializeCommonEnvironment() { private static function initializeCommonEnvironment() {
self::buildConfigurationSourceStack();
PhutilErrorHandler::initialize(); PhutilErrorHandler::initialize();
self::buildConfigurationSourceStack();
$tz = PhabricatorEnv::getEnvConfig('phabricator.timezone'); $tz = PhabricatorEnv::getEnvConfig('phabricator.timezone');
if ($tz) { if ($tz) {
date_default_timezone_set($tz); date_default_timezone_set($tz);
@ -156,7 +156,7 @@ final class PhabricatorEnv {
$stack->pushSource( $stack->pushSource(
id(new PhabricatorConfigDatabaseSource('default')) id(new PhabricatorConfigDatabaseSource('default'))
->setName(pht("Database"))); ->setName(pht("Database")));
} catch (AphrontQueryException $recoverable) { } catch (AphrontQueryException $exception) {
// If the database is not available, just skip this configuration // If the database is not available, just skip this configuration
// source. This happens during `bin/storage upgrade`, `bin/conf` before // source. This happens during `bin/storage upgrade`, `bin/conf` before
// schema setup, etc. // schema setup, etc.