Fixed for CRM-13146

diff --git a/CRM/Contact/BAO/Contact/Location.php b/CRM/Contact/BAO/Contact/Location.php
index f9e288cef70a3a4d963008b66521488552a99904..205600ec61917877f69e5b9f7352962c9931bbbe 100644 (file)
--- a/CRM/Contact/BAO/Contact/Location.php
+++ b/CRM/Contact/BAO/Contact/Location.php
@@ -186,7 +186,7 @@ AND civicrm_contact.id IN $idString ";
         array($dao->country)
       );
       $location['address'] = addslashes($address);
-      $location['displayAddress'] = str_replace('<br />', ', ', $address);
+      $location['displayAddress'] = str_replace('<br />', ', ', addslashes($address));
       $location['url'] = CRM_Utils_System::url('civicrm/contact/view', 'reset=1&cid=' . $dao->contact_id);
       $location['location_type'] = $dao->location_type;
       $location['image'] = CRM_Contact_BAO_Contact_Utils::getImage(isset($dao->contact_sub_type) ?