X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FUtils%2FJSON.php;h=5f3bcabd85a2e3c275ca917e77d5f413a67d3d73;hb=4521630a5f9dc502ec8b47aa90f1db7a46d44214;hp=6aa8af5de2093df20b7e7e34ab1b7e299a49b970;hpb=49cfbaed65e6920698d83b57985df1eb228479a2;p=civicrm-core.git diff --git a/CRM/Utils/JSON.php b/CRM/Utils/JSON.php index 6aa8af5de2..5f3bcabd85 100644 --- a/CRM/Utils/JSON.php +++ b/CRM/Utils/JSON.php @@ -1,34 +1,18 @@ ', $value[$element]), '"\\') . '"'; + $sOutput .= '"' . addcslashes(str_replace(["\r\n", "\n", "\r"], '
', $value[$element]), '"\\') . '"'; // remove extra spaces and tab character that breaks dataTable CRM-12551 $sOutput = preg_replace("/\s+/", " ", $sOutput);