Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Move login_cookie_times earlier in the process #6196

Merged
merged 1 commit into from
Oct 17, 2020
Merged

fix: Move login_cookie_times earlier in the process #6196

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions Sources/Load.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,6 +428,15 @@ function reloadSettings()
'html',
);

// Login Cookie times. Format: time => txt
$context['login_cookie_times'] = array(
3153600 => 'always_logged_in',
60 => 'one_hour',
1440 => 'one_day',
10080 => 'one_week',
43200 => 'one_month',
);

// Call pre load integration functions.
call_integration_hook('integrate_pre_load');
}
Expand Down Expand Up @@ -770,15 +779,6 @@ function loadUserSettings()
$user_info['time_offset'] = 0;
}

// Login Cookie times. Format: time => txt
$context['login_cookie_times'] = array(
3153600 => 'always_logged_in',
60 => 'one_hour',
1440 => 'one_day',
10080 => 'one_week',
43200 => 'one_month',
);

// Set up the $user_info array.
$user_info += array(
'id' => $id_member,
Expand Down