Merge branch 'MDL-40934-master' of git://github.com/FMCorz/moodle

Conflicts: auth/tests/auth_test.php
2013-08-06 14:37:43 +12:00
parent 3550fc28fb d95db915ed
commit e145762b17
5 changed files with 42 additions and 88 deletions
@@ -618,8 +618,7 @@ function login_is_lockedout($user) {
 function login_attempt_valid($user) {
    global $CFG;

-    $event = \core_auth\event\user_loggedin::create(array('objectid' => $user->id,
-        'other' => array('username' => $user->username)));
+    $event = \core\event\user_loggedin::create(array('objectid' => $user->id, 'other' => array('username' => $user->username)));
    $event->add_record_snapshot('user', $user);
    $event->trigger();