aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--include/functions_session.inc.php2
-rw-r--r--include/functions_user.inc.php4
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')) )
{