CRM-13793 cleanup - assignment in condition, changed to test for
equality
CRM-13793 cleanup of assignment in condition
removed unnecessary assignment
Merge pull request #2033 from JoeMurray/master

CRM-13793 cleanup - assignment in condition, changed to test for equality