diff options
Diffstat (limited to 'index.php')
| -rw-r--r-- | index.php | 13 |
1 files changed, 7 insertions, 6 deletions
@@ -12,8 +12,12 @@ $install = ((file_exists('.htconfig.php')) ? false : true); @include(".htconfig.php"); -if(isset($lang) && strlen($lang)) - load_translation_table($lang); +// get language setting directly from system variables, bypassing get_config() +// as database may not yet be configured. + +$lang = ((isset($a->config['system']['language'])) ? $a->config['system']['language'] : 'en'); + +load_translation_table($lang); require_once("dba.php"); $db = new dba($db_host, $db_user, $db_pass, $db_data, $install); @@ -111,7 +115,7 @@ if($a->module != 'install') // make sure the desired theme exists, though if the default theme doesn't exist we're stuffed. -if((x($_SESSION,'theme')) && (! file_exists('/view/theme/' . $_SESSION['theme'] . '/style.css'))) +if((x($_SESSION,'theme')) && (! file_exists('view/theme/' . $_SESSION['theme'] . '/style.css'))) unset($_SESSION['theme']); $a->page['htmlhead'] = replace_macros($a->page['htmlhead'], array( @@ -122,9 +126,6 @@ $a->page['htmlhead'] = replace_macros($a->page['htmlhead'], array( $page = $a->page; $profile = $a->profile; -$lang = get_config('system','language'); -if($lang === false) - $lang = 'en'; header("Content-type: text/html; charset=utf-8"); |