From 9ee482949785bf2f7c918b334d6f7a4f0d6abccb Mon Sep 17 00:00:00 2001 From: jsatoh Date: Tue, 29 Jul 2014 06:42:33 +0000 Subject: [PATCH] 2014-07-29 Junichi Satoh * include/functions_events.php: Fixed a bug that event's comment is not shown when it includes newline. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10360 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 5 +++++ pandora_console/include/functions_events.php | 1 + 2 files changed, 6 insertions(+) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 2d0ebe7af8..d2e096b2ef 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,8 @@ +2014-07-29 Junichi Satoh + + * include/functions_events.php: Fixed a bug that event's comment + is not shown when it includes newline. + 2014-07-28 Junichi Satoh * operation/agentes/estado_agente.php: Fixed sql error. diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php index a1f0295957..49052a6dd0 100644 --- a/pandora_console/include/functions_events.php +++ b/pandora_console/include/functions_events.php @@ -2253,6 +2253,7 @@ function events_page_comments ($event) { $table_comments->class = "alternate rounded_cells"; $event_comments = io_safe_output($event["user_comment"]); + $event_comments = str_replace("\n", "
", $event_comments); // If comments are not stored in json, the format is old $event_comments_array = json_decode($event_comments, true);