CRM-12606: do not escape() the strings twice.
Merge pull request #734 from mlutfy/crm12606

CRM-12606: do not escape() the strings twice.