diff options
| author | plg <plg@s04> | 2016-02-10 15:21:22 +0100 |
|---|---|---|
| committer | plg <plg@s04> | 2016-02-10 15:21:22 +0100 |
| commit | e71b61aee1b3e077899bb8276398f4c705586e51 (patch) | |
| tree | dc96d3aec9e8f1daf2a9413b0ecbba369754fd39 /include | |
| parent | a35c7bdf18ef2e74738a0867b70aab18aa48ec9f (diff) | |
| parent | 08fe998dd10fbf3fe79e8722df891b9496228b4a (diff) | |
Merge branch 'nikrou-fix_408'
Diffstat (limited to 'include')
| -rw-r--r-- | include/functions_user.inc.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/functions_user.inc.php b/include/functions_user.inc.php index ac85d1b47..2591929b4 100644 --- a/include/functions_user.inc.php +++ b/include/functions_user.inc.php @@ -945,10 +945,13 @@ function log_user($user_id, $remember_me) { // make sure we clean any remember me ... setcookie($conf['remember_me_name'], '', 0, cookie_path(),ini_get('session.cookie_domain')); } - if ( session_id()!="" and (version_compare(PHP_VERSION, '7') <= 0 or version_compare(PHP_VERSION, '7.0.3') >= 0)) + if ( session_id()!="" ) { // we regenerate the session for security reasons // see http://www.acros.si/papers/session_fixation.pdf - session_regenerate_id(true); + if (version_compare(PHP_VERSION, '7') <= 0) + { + session_regenerate_id(true); + } } else { |