Use of StringUtil::getAnchorTag()

diff --git a/wcfsetup/install/files/lib/system/option/user/FacebookUserOptionOutput.class.php b/wcfsetup/install/files/lib/system/option/user/FacebookUserOptionOutput.class.php
index 04a083f4dc488ccf574f18a3731a34e6b2a81377..741eca8f00d1b75ef7880761064e69f986b1987a 100644 (file)
--- a/wcfsetup/install/files/lib/system/option/user/FacebookUserOptionOutput.class.php
+++ b/wcfsetup/install/files/lib/system/option/user/FacebookUserOptionOutput.class.php
@@ -19,9 +19,6 @@ class FacebookUserOptionOutput implements IUserOptionOutput {
        public function getOutput(User $user, UserOption $option, $value) {
                if (empty($value)) return '';
                
-               $url = StringUtil::encodeHTML('https://www.facebook.com/'.$value);
-               $value = StringUtil::encodeHTML($value);
-               
-               return '<a href="'.$url.'" class="externalURL"'.((EXTERNAL_LINK_REL_NOFOLLOW || EXTERNAL_LINK_TARGET_BLANK) ? (' rel="'.(EXTERNAL_LINK_REL_NOFOLLOW ? 'nofollow' : '').((EXTERNAL_LINK_REL_NOFOLLOW && EXTERNAL_LINK_TARGET_BLANK) ? ' ' : '').(EXTERNAL_LINK_TARGET_BLANK ? 'noopener noreferrer' : '').'"') : '').(EXTERNAL_LINK_TARGET_BLANK ? ' target="_blank"' : '').'>'.$value.'</a>';
+               return StringUtil::getAnchorTag('https://www.facebook.com/'.$value, $value);
        }
 }

diff --git a/wcfsetup/install/files/lib/system/option/user/TwitterUserOptionOutput.class.php b/wcfsetup/install/files/lib/system/option/user/TwitterUserOptionOutput.class.php
index 1dd36cb9ce9487f0635bb83632abb2cd2220b5c4..d9fc30ccf9e07db37c9cfe52bbe2ecad7542402e 100644 (file)
--- a/wcfsetup/install/files/lib/system/option/user/TwitterUserOptionOutput.class.php
+++ b/wcfsetup/install/files/lib/system/option/user/TwitterUserOptionOutput.class.php
@@ -19,9 +19,6 @@ class TwitterUserOptionOutput implements IUserOptionOutput {
        public function getOutput(User $user, UserOption $option, $value) {
                if (empty($value)) return '';
                
-               $url = StringUtil::encodeHTML('https://twitter.com/'.$value);
-               $value = StringUtil::encodeHTML($value);
-               
-               return '<a href="'.$url.'" class="externalURL"'.((EXTERNAL_LINK_REL_NOFOLLOW || EXTERNAL_LINK_TARGET_BLANK) ? (' rel="'.(EXTERNAL_LINK_REL_NOFOLLOW ? 'nofollow' : '').((EXTERNAL_LINK_REL_NOFOLLOW && EXTERNAL_LINK_TARGET_BLANK) ? ' ' : '').(EXTERNAL_LINK_TARGET_BLANK ? 'noopener noreferrer' : '').'"') : '').(EXTERNAL_LINK_TARGET_BLANK ? ' target="_blank"' : '').'>'.$value.'</a>';
+               return StringUtil::getAnchorTag('https://twitter.com/'.$value, $value);
        }
 }