kashire/lainchan
4
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

Merge pull request #12 from mgrabovsky/install-errors

Browse Source 
Fix errors about uninitialized config during install
This commit is contained in:
Michael Walker 2015-03-27 14:14:35 +00:00
commit ff2531a61e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
inc/functions.php
View File

@ -88,6 +88,8 @@ function loadConfig() {
$config[$key] = array(); $config[$key] = array();
} }
require 'inc/config.php';
if (!file_exists('inc/instance-config.php')) if (!file_exists('inc/instance-config.php'))
$error('Tinyboard is not configured! Create 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); init_locale($config['locale'], $error);
} }
require 'inc/config.php';
require 'inc/instance-config.php'; require 'inc/instance-config.php';
if (isset($board['dir']) && file_exists($board['dir'] . '/config.php')) { if (isset($board['dir']) && file_exists($board['dir'] . '/config.php')) {