From 74f83dbaa0a14c34ba89da42bf7e86dc5c0ea820 Mon Sep 17 00:00:00 2001
From: zarzuelo <zarzuelo@gmail.com>
Date: Fri, 17 Jun 2011 09:45:53 +0000
Subject: [PATCH] 2011-06-17  Sergio Martin <sergio.martin@artica.es>

	* include/functions_events.php: Fixed duplication of comments
	when validate events merged from 3.2.1



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4465 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 pandora_console/ChangeLog                    | 5 +++++
 pandora_console/include/functions_events.php | 5 ++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 8ed720c9b7..853f414d12 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-17  Sergio Martin <sergio.martin@artica.es>
+
+	* include/functions_events.php: Fixed duplication of comments
+	when validate events merged from 3.2.1
+
 2011-06-16 Sancho Lerena <slerena@artica.es>
 
     * include/styles/install.css,
diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php
index 8640311c8f..d0ef7ad118 100644
--- a/pandora_console/include/functions_events.php
+++ b/pandora_console/include/functions_events.php
@@ -185,14 +185,13 @@ function events_validate_event ($id_event, $similars = true, $comment = '', $new
 	}else {
 		$commentbox = '';
 	}
-
-	$comment = '<b>-- '.$new_status_string.' '.__('by').' '.$config['id_user'].' '.'['.date ($config["date_format"]).'] --</b><br>'.$commentbox;
 	
 	foreach ($id_event as $event) {
+		$comment = '<b>-- '.$new_status_string.' '.__('by').' '.$config['id_user'].' '.'['.date ($config["date_format"]).'] --</b><br>'.$commentbox;
+		
 		$fullevent = events_get_event($event);
 
 		if($fullevent['user_comment'] != ''){
-			$commentbox = '<div style="border:1px dotted #CCC; min-height: 10px;">'.$fullevent['user_comment'].'</div>';
 			$comment .= '<br>'.$fullevent['user_comment'];
 		}