@@ -116,7 +116,8 @@ discard block |
||
| 116 | 116 | if (!$previewing && strpos($message, '[html]') !== false) |
| 117 | 117 | { |
| 118 | 118 | if (allowedTo('admin_forum')) |
| 119 | - $message = preg_replace_callback('~\[html\](.+?)\[/html\]~is', function($m) { |
|
| 119 | + $message = preg_replace_callback('~\[html\](.+?)\[/html\]~is', function($m) |
|
| 120 | + { |
|
| 120 | 121 | return '[html]' . strtr(un_htmlspecialchars($m[1]), array("\n" => ' ', ' ' => '  ', '[' => '[', ']' => ']')) . '[/html]'; |
| 121 | 122 | }, $message); |
| 122 | 123 | |
@@ -1245,7 +1246,6 @@ discard block |
||
| 1245 | 1246 | |
| 1246 | 1247 | return array($charset, $string, 'base64'); |
| 1247 | 1248 | } |
| 1248 | - |
|
| 1249 | 1249 | else |
| 1250 | 1250 | return array($charset, $string, '7bit'); |
| 1251 | 1251 | } |
@@ -1731,7 +1731,7 @@ discard block |
||
| 1731 | 1731 | // Get any members who were possibly mentioned |
| 1732 | 1732 | $msgOptions['mentioned_members'] = Mentions::getMentionedMembers($msgOptions['body']); |
| 1733 | 1733 | if (!empty($msgOptions['mentioned_members'])) |
| 1734 | - { |
|
| 1734 | + { |
|
| 1735 | 1735 | // Replace @name with [member=id]@name[/member] |
| 1736 | 1736 | $msgOptions['body'] = Mentions::getBody($msgOptions['body'], $msgOptions['mentioned_members']); |
| 1737 | 1737 | |