X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FUtils%2FJSON.php;h=d771de94e4e6f35ab7b50301bf0fccf991d3ee2c;hb=699cef658363c387ca837689746e160b43b95119;hp=0b7f171a33dec97e3ec2ecd6ad92f50e81140e80;hpb=5e27028609a22fb01370d7ed1d7a9290ff27918f;p=civicrm-core.git diff --git a/CRM/Utils/JSON.php b/CRM/Utils/JSON.php index 0b7f171a33..d771de94e4 100644 --- a/CRM/Utils/JSON.php +++ b/CRM/Utils/JSON.php @@ -3,7 +3,7 @@ +--------------------------------------------------------------------+ | CiviCRM version 5 | +--------------------------------------------------------------------+ - | Copyright CiviCRM LLC (c) 2004-2018 | + | Copyright CiviCRM LLC (c) 2004-2019 | +--------------------------------------------------------------------+ | This file is a part of CiviCRM. | | | @@ -28,7 +28,7 @@ /** * * @package CRM - * @copyright CiviCRM LLC (c) 2004-2018 + * @copyright CiviCRM LLC (c) 2004-2019 */ /** @@ -78,7 +78,7 @@ class CRM_Utils_JSON { // CRM-7130 --lets addslashes to only double quotes, // since we are using it to quote the field value. // str_replace helps to provide a break for new-line - $sOutput .= '"' . addcslashes(str_replace(array("\r\n", "\n", "\r"), '
', $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);