----------v2.1.7-cvs----------[cjh] SECURITY: Fix unchecked access to contacts in the same SQL table (Bug #6208).
------v2.1.6------