L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-43785-28' of git://github.com/andrewnicols/moodle into MOODLE_28_STABLE

Browse Source
This commit is contained in:
Dan Poltawski
2015-07-27 14:49:42 +01:00
parent e205936ac9 ea2e3f1c82
commit 96b529314f
3 changed files with 33 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/moodlelib.php
+13 -4
View File
@@ -2842,6 +2842,11 @@ function require_login($courseorid = null, $autologinguest = true, $cm = null, $
$preventredirect = true;
}
if (AJAX_SCRIPT) {
// We cannot redirect for AJAX scripts either.
$preventredirect = true;
}
// Setup global $COURSE, themes, language and locale.
if (!empty($courseorid)) {
if (is_object($courseorid)) {
@@ -2881,11 +2886,15 @@ function require_login($courseorid = null, $autologinguest = true, $cm = null, $
}
// Redirect to the login page if session has expired, only with dbsessions enabled (MDL-35029) to maintain current behaviour.
if ((!isloggedin() or isguestuser()) && !empty($SESSION->has_timed_out) && !$preventredirect && !empty($CFG->dbsessions)) {
if ($setwantsurltome) {
$SESSION->wantsurl = qualified_me();
if ((!isloggedin() or isguestuser()) && !empty($SESSION->has_timed_out) && !empty($CFG->dbsessions)) {
if ($preventredirect) {
throw new require_login_session_timeout_exception();
} else {
if ($setwantsurltome) {
$SESSION->wantsurl = qualified_me();
}
redirect(get_login_url());
}
redirect(get_login_url());
}
// If the user is not even logged in yet then make sure they are.