diff options
| author | fisharebest <fisharebest@gmail.com> | 2013-10-22 13:19:01 +0100 |
|---|---|---|
| committer | fisharebest <fisharebest@gmail.com> | 2013-10-22 13:19:31 +0100 |
| commit | f0a555c029d14a0cecf97dde5d1ee92afd32bdbb (patch) | |
| tree | 7a16ddec95acf928b0bcd70047a950cd518a52ed /modules_v3 | |
| parent | 4c3550ab962551ce850a75e43eb8b96d2e8f9438 (diff) | |
| download | webtrees-f0a555c029d14a0cecf97dde5d1ee92afd32bdbb.tar.gz webtrees-f0a555c029d14a0cecf97dde5d1ee92afd32bdbb.tar.bz2 webtrees-f0a555c029d14a0cecf97dde5d1ee92afd32bdbb.zip | |
Two busg: #1237452 - New user/New registration mails - Family Tree Title with ' - dev; #1237458 - Webtrees messages with odd texts - dev
Diffstat (limited to 'modules_v3')
| -rw-r--r--[-rwxr-xr-x] | modules_v3/user_messages/module.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules_v3/user_messages/module.php b/modules_v3/user_messages/module.php index 631913caf2..0b6c7a20c3 100755..100644 --- a/modules_v3/user_messages/module.php +++ b/modules_v3/user_messages/module.php @@ -103,12 +103,12 @@ class user_messages_WT_Module extends WT_Module implements WT_Module_Block { $content.='</td>'; $content.='</tr>'; $content.='<tr><td class="list_value_wrap" colspan="5"><div id="message'.$message->message_id.'" style="display:none;">'; - $content.=expand_urls(nl2br(WT_Filter::escapeHtml($message->body), false)).'<br><br>'; + $content.=WT_Filter::expandUrls($message->body).'<br><br>'; if (strpos($message->subject, /* I18N: When replying to an email, the subject becomes “RE: <subject>” */ WT_I18N::translate('RE: '))!==0) { $message->subject= WT_I18N::translate('RE: ').$message->subject; } if ($user_id) { - $content.='<a href="#" onclick="reply(\''.WT_Filter::escapeHtml($message->sender).'\', \''.WT_Filter::escapeHtml($message->subject).'\'); return false;">'.WT_I18N::translate('Reply').'</a> | '; + $content.='<a href="#" onclick="reply(\''.WT_Filter::escapeJs($message->sender).'\', \''.WT_Filter::escapeJs($message->subject).'\'); return false;">'.WT_I18N::translate('Reply').'</a> | '; } $content.='<a href="index.php?action=deletemessage&message_id[]='.$message->message_id.'" onclick="return confirm(\''.WT_I18N::translate('Are you sure you want to delete this message? It cannot be retrieved later.').'\');">'.WT_I18N::translate('Delete').'</a></div></td></tr>'; } |