From 47a1e49c1e7b09403ce567f30c31a15856a8fdae Mon Sep 17 00:00:00 2001 From: z0rglub Date: Tue, 7 Sep 2004 19:29:42 +0000 Subject: - corrects bugs due to deletion of configuration parameters default_lang, default_style (renamed to default_language and default_template), session_keyword - in install.php, corrects bug to deletion of language keys : conf_general_webmaster, conf_general_webmaster_info and renaming of conf_general_mail git-svn-id: http://piwigo.org/svn/trunk@518 68402e56-0260-453c-a942-63ccdbb3a9ee --- include/functions_user.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/functions_user.inc.php') diff --git a/include/functions_user.inc.php b/include/functions_user.inc.php index 5af68ad4e..dfa980adb 100644 --- a/include/functions_user.inc.php +++ b/include/functions_user.inc.php @@ -213,8 +213,8 @@ function init_userprefs($userdata) { global $conf, $template, $lang, $lang_info; - $language = (!empty($userdata['language']) && !$userdata['is_the_guest'] )?$userdata['language']:$conf['default_lang']; - $style = (!empty($userdata['template'])&& !$userdata['is_the_guest'] )?$userdata['template']:$conf['default_style']; + $language = (!empty($userdata['language']) && !$userdata['is_the_guest'] )?$userdata['language']:$conf['default_language']; + $style = (!empty($userdata['template'])&& !$userdata['is_the_guest'] )?$userdata['template']:$conf['default_template']; if ( !file_exists(@realpath(PHPWG_ROOT_PATH . 'language/' . $language . '/common.lang.php')) ) { -- cgit v1.2.3