CRM-13793 assignment in condition code cleanup. Also line 107 fixed apparent bug.
Merge pull request #2055 from JoeMurray/CRM-13793

CRM-13793 assignment in condition code cleanup. Also line 107 fixed apparent bug.