From: Andrew Nicols <andrew@nicols.co.uk>
Date: Fri, 3 May 2019 00:49:33 +0000 (+0800)
Subject: Merge branch 'MDL-64394-accesslog' of https://github.com/brendanheywood/moodle
X-Git-Tag: v3.7.0-beta~88
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=ea00cdc79fa6a67608256242bf2f8a45cff4f478

Merge branch 'MDL-64394-accesslog' of https://github.com/brendanheywood/moodle
---

ea00cdc79fa6a67608256242bf2f8a45cff4f478
diff --cc lib/moodlelib.php
index 67e3e72913e,7aa02d8eb73..820dc475545
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@@ -2699,10 -2692,7 +2699,11 @@@ function require_login($courseorid = nu
                  $authplugin = get_auth_plugin($authname);
                  $authplugin->pre_loginpage_hook();
                  if (isloggedin()) {
 +                    if ($cm) {
 +                        $modinfo = get_fast_modinfo($course);
 +                        $cm = $modinfo->get_cm($cm->id);
 +                    }
+                     set_access_log_user();
                      break;
                  }
              }