tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
zarzuelo 2011-06-17 09:45:53 +00:00
parent e2790a2b75
commit 7a1696703e
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/ChangeLog
View File

@ -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> 2011-06-16 Sancho Lerena <slerena@artica.es>
* include/styles/install.css, * include/styles/install.css,

5
pandora_console/include/functions_events.php
View File

@ -185,14 +185,13 @@ function events_validate_event ($id_event, $similars = true, $comment = '', $new
}else { }else {
$commentbox = ''; $commentbox = '';
} }
$comment = '<b>-- '.$new_status_string.' '.__('by').' '.$config['id_user'].' '.'['.date ($config["date_format"]).'] --</b><br>'.$commentbox;
foreach ($id_event as $event) { 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); $fullevent = events_get_event($event);
if($fullevent['user_comment'] != ''){ if($fullevent['user_comment'] != ''){
$commentbox = '<div style="border:1px dotted #CCC; min-height: 10px;">'.$fullevent['user_comment'].'</div>';
$comment .= '<br>'.$fullevent['user_comment']; $comment .= '<br>'.$fullevent['user_comment'];
} }