merging 5.4.4 changes
This commit is contained in:
parent
2b6d4a36fc
commit
6272369816
12 changed files with 1842 additions and 18 deletions
|
|
@ -557,6 +557,9 @@ sub www_viewMessageLogMessage {
|
|||
if ($data{url} ne "") {
|
||||
$output .= '</a>';
|
||||
}
|
||||
unless ($data{message} =~ /\<div\>/ig || $data{message} =~ /\<br\>/ig || $data{message} =~ /\<p\>/ig) {
|
||||
$data{message} =~ s/\n/\<br\>/g;
|
||||
}
|
||||
$output .= '<br>'.$data{message}.'<p>';
|
||||
if ($data{url} ne "" && $data{status} eq 'pending') {
|
||||
$output .= '<a href="'.$data{url}.'">'.WebGUI::International::get(554).'</a> · ';
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue