@@ -1728,20 +1728,20 @@  | 
                                                    ||
| 1728 | 1728 | |
| 1729 | 1729 | if (!empty($modSettings['enable_mentions']))  | 
                                                        
| 1730 | 1730 |  	{ | 
                                                        
| 1731 | - // Get any members who were possibly mentioned  | 
                                                        |
| 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 | -        { | 
                                                        |
| 1735 | - // Replace @name with [member=id]@name[/member]  | 
                                                        |
| 1734 | +		{ | 
                                                        |
| 1735 | + // Replace @name with [member=id]@name[/member]  | 
                                                        |
| 1736 | 1736 | $msgOptions['body'] = Mentions::getBody($msgOptions['body'], $msgOptions['mentioned_members']);  | 
                                                        
| 1737 | 1737 | |
| 1738 | 1738 | // Remove any members who weren't actually mentioned, to prevent bogus notifications  | 
                                                        
| 1739 | - foreach ($msgOptions['mentioned_members'] as $m)  | 
                                                        |
| 1740 | -            { | 
                                                        |
| 1741 | -                if (preg_match('~\[member=' . $m['id'] . '\]@' . $m['real_name'] . '\[/member\]~u', $msgOptions['body']) === 0) | 
                                                        |
| 1742 | - unset($msgOptions['mentioned_members'][$m['id']]);  | 
                                                        |
| 1743 | - }  | 
                                                        |
| 1744 | - }  | 
                                                        |
| 1739 | + foreach ($msgOptions['mentioned_members'] as $m)  | 
                                                        |
| 1740 | +			{ | 
                                                        |
| 1741 | +				if (preg_match('~\[member=' . $m['id'] . '\]@' . $m['real_name'] . '\[/member\]~u', $msgOptions['body']) === 0) | 
                                                        |
| 1742 | + unset($msgOptions['mentioned_members'][$m['id']]);  | 
                                                        |
| 1743 | + }  | 
                                                        |
| 1744 | + }  | 
                                                        |
| 1745 | 1745 | }  | 
                                                        
| 1746 | 1746 | |
| 1747 | 1747 | // It's do or die time: forget any user aborts!  | 
                                                        
@@ -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 | |