diff --git a/classes/display/DisplayHandler.class.php b/classes/display/DisplayHandler.class.php
index 718ef8382..8b386f4eb 100644
--- a/classes/display/DisplayHandler.class.php
+++ b/classes/display/DisplayHandler.class.php
@@ -169,9 +169,7 @@
             $variables = $oModule->getVariables();
             $variables['error'] = $oModule->getError();
             $variables['message'] = $oModule->getMessage();
-            //if(function_exists('json_encode')) return json_encode($variables);
-            //else return json_encode2($variables);
-            $json = str_replace("\r\n",'\n',json_encode2($variables));
+            $json = preg_replace("(\r\n|\n)",'\n',json_encode2($variables));
             return $json;
         }