MDL-63303 message: fix get_member_info iscontact check

2018-11-15 14:40:12 +08:00
parent c61353ae41
commit 38004e777f
1 changed files with 2 additions and 2 deletions
@@ -507,11 +507,11 @@ class helper {
        $userssql = "SELECT $userfields, u.deleted, mc.id AS contactid, mub.id AS blockedid
                       FROM {user} u
                  LEFT JOIN {message_contacts} mc
-                         ON (mc.userid = ? AND mc.contactid = u.id)
+                         ON ((mc.userid = ? AND mc.contactid = u.id) OR (mc.userid = u.id AND mc.contactid = ?))
                  LEFT JOIN {message_users_blocked} mub
                         ON (mub.userid = ? AND mub.blockeduserid = u.id)
                      WHERE u.id $useridsql";
-        $usersparams = array_merge([$referenceuserid, $referenceuserid], $usersparams);
+        $usersparams = array_merge([$referenceuserid, $referenceuserid, $referenceuserid], $usersparams);
        $otherusers = $DB->get_records_sql($userssql, $usersparams);

        $members = [];