diff options
| author | Michael Walker <mike@barrucadu.co.uk> | 2015-03-27 14:14:35 +0000 |
|---|---|---|
| committer | Michael Walker <mike@barrucadu.co.uk> | 2015-03-27 14:14:35 +0000 |
| commit | ff2531a61ee1d27e1e0f8ece0642d19161267e08 (patch) | |
| tree | e88531f5391b225899ef55f68fac85a569410253 | |
| parent | ba7b5edcdf7aba4666f19b72e1df3ff37cb4638d (diff) | |
| parent | 6b21689dcd6aa382c38752db56ce54e6b80bb332 (diff) | |
Merge pull request #12 from mgrabovsky/install-errors
Fix errors about uninitialized config during install
| -rw-r--r-- | inc/functions.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/inc/functions.php b/inc/functions.php index 65b49b37..06262e30 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -88,6 +88,8 @@ function loadConfig() { $config[$key] = array(); } + require 'inc/config.php'; + if (!file_exists('inc/instance-config.php')) $error('Tinyboard is not configured! Create inc/instance-config.php.'); @@ -112,8 +114,6 @@ function loadConfig() { init_locale($config['locale'], $error); } - require 'inc/config.php'; - require 'inc/instance-config.php'; if (isset($board['dir']) && file_exists($board['dir'] . '/config.php')) { |