Fixed email bbcode

diff --git a/wcfsetup/install/files/lib/system/bbcode/EmailBBCode.class.php b/wcfsetup/install/files/lib/system/bbcode/EmailBBCode.class.php
index 78cc5a361b7cbcbc4457c126bf658551ecc81144..20f607881ba81ec8d073a34a0c62e1d31704256d 100644 (file)
--- a/wcfsetup/install/files/lib/system/bbcode/EmailBBCode.class.php
+++ b/wcfsetup/install/files/lib/system/bbcode/EmailBBCode.class.php
@@ -21,6 +21,6 @@ class EmailBBCode extends AbstractBBCode {
                }
                $email = StringUtil::decodeHTML($email);
                
-               return '<a href="mailto:' . StringUtil::encodeAllChars($email) . '">' . $content . '</a>';
+               return '<a href="mailto:' . StringUtil::encodeAllChars($email) . '">' . StringUtil::encodeHTML($email) . '</a>';
        }
 }

diff --git a/wcfsetup/install/files/lib/system/bbcode/HtmlBBCodeParser.class.php b/wcfsetup/install/files/lib/system/bbcode/HtmlBBCodeParser.class.php
index b65a9cf4997b44a4d9c35348dd7cfb62a6b0d6f1..9160ac096725ec920ef10ec0cdf34e79d2b9e0e0 100644 (file)
--- a/wcfsetup/install/files/lib/system/bbcode/HtmlBBCodeParser.class.php
+++ b/wcfsetup/install/files/lib/system/bbcode/HtmlBBCodeParser.class.php
@@ -104,7 +104,7 @@ class HtmlBBCodeParser extends BBCodeParser {
                }
                unset($tag);
                
-               // step 2) check if tags are properly opened and closed, incorrect nesting doen't matter here
+               // step 2) check if tags are properly opened and closed, incorrect nesting doesn't matter here
                foreach ($this->tagArray as $i => &$tag) {
                        if (!$tag['valid']) {
                                continue;