From: skodak <skodak>
Date: Fri, 8 May 2009 12:16:09 +0000 (+0000)
Subject: MDL-18704 fixed incorrect mnet logging; merged from MOODLE_19_STABLE
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=457c97291b82d7e6017275690bcdbd527afa23c3;p=moodle.git

MDL-18704 fixed incorrect mnet logging; merged from MOODLE_19_STABLE
---

diff --git a/auth/mnet/auth.php b/auth/mnet/auth.php
index 535e458461..da5a9492e1 100644
--- 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;
                 }