MDL-18704 fixed incorrect mnet logging; merged from MOODLE_19_STABLE

diff --git a/auth/mnet/auth.php b/auth/mnet/auth.php
index 535e458461c5c9c5a7e0cd6a3c946a2eb34b909b..da5a9492e104e039759ebd998ff66c5cde9828d3 100644 (file)
--- a/auth/mnet/auth.php
+++ b/auth/mnet/auth.php
@@ -877,7 +877,7 @@ class auth_plugin_mnet extends auth_plugin_base {
             if (isset($useridarray[$logEntryObj->username])) {
                 $logEntryObj->userid = $useridarray[$logEntryObj->username];
             } else {
-                $logEntryObj->userid = $DB->get_field('user', 'id', array('username'=>$logEntryObj->username));
+                $logEntryObj->userid = $DB->get_field('user', 'id', array('username'=>$logEntryObj->username, 'mnethostid'=>(int)$logEntryObj->hostid));
                 if ($logEntryObj->userid == false) {
                     $logEntryObj->userid = 0;
                 }