Merge pull request #676 from greezybacon/issue/615

email: Fix incorrect matching of user ids

Reviewed-By: Peter Rotich <peter@osticket.com>

include/class.thread.php

@@ -370,7 +370,10 @@ Class ThreadEntry {
     }
 
     function getEmailReferencesForUser($user) {
-        return $this->getTaggedEmailReferences('u', $user->getId());
+        return $this->getTaggedEmailReferences('u',
+            ($user instanceof Collaborator)
+                ? $user->getUserId()
+                : $user->getId());
     }
 
     function getEmailReferencesForStaff($staff) {