MDL-34965 core_lib Redirect to the login page when session expires before autologin...

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 55cfd1f..646c1eb 100644 (file)
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -2775,6 +2775,14 @@ function require_login($courseorid = NULL, $autologinguest = true, $cm = NULL, $
         $setwantsurltome = false;
     }
 
+    // Redirect to the login page if session has expired, only with dbsessions enabled (MDL-35029) to maintain current behaviour.
+    if (!empty($SESSION->has_timed_out) && !$preventredirect && !empty($CFG->dbsessions)) {
+        if ($setwantsurltome) {
+            $SESSION->wantsurl = qualified_me();
+        }
+        redirect(get_login_url());
+    }
+
     // If the user is not even logged in yet then make sure they are
     if (!isloggedin()) {
         if ($autologinguest and !empty($CFG->guestloginbutton) and !empty($CFG->autologinguests)) {