diff options
| author | z0rglub <z0rglub@piwigo.org> | 2004-09-07 19:29:42 +0000 |
|---|---|---|
| committer | z0rglub <z0rglub@piwigo.org> | 2004-09-07 19:29:42 +0000 |
| commit | 47a1e49c1e7b09403ce567f30c31a15856a8fdae (patch) | |
| tree | 6b5cf1dfc675a6f13fd55a33ccfc0c0c00331a18 /include | |
| parent | 21886493a7c8c508b613d35c01fa28c4604408a5 (diff) | |
- 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
Diffstat (limited to 'include')
| -rw-r--r-- | include/functions_session.inc.php | 2 | ||||
| -rw-r--r-- | include/functions_user.inc.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/functions_session.inc.php b/include/functions_session.inc.php index 17991bb58..a92deb7a4 100644 --- a/include/functions_session.inc.php +++ b/include/functions_session.inc.php @@ -35,7 +35,7 @@ function generate_key() { global $conf; - $md5 = md5( substr( microtime(), 2, 6 ).$conf['session_keyword'] ); + $md5 = md5(substr(microtime(), 2, 6)); $init = ''; for ( $i = 0; $i < strlen( $md5 ); $i++ ) { 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')) ) { |