Removed EXTERNAL_LINK_REL_NOFOLLOW

diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml
index 9fd0072be3a18fdd49a9459c09b6388b7f7b6205..900cf74ee0c3abbf42f2ba4548cd5cf836a62b29 100644 (file)
--- a/com.woltlab.wcf/option.xml
+++ b/com.woltlab.wcf/option.xml
@@ -442,11 +442,6 @@
                                <optiontype>boolean</optiontype>
                                <defaultvalue>1</defaultvalue>
                        </option>
-                       <option name="external_link_rel_nofollow">
-                               <categoryname>general.page</categoryname>
-                               <optiontype>boolean</optiontype>
-                               <defaultvalue>1</defaultvalue>
-                       </option>
                        <option name="external_link_target_blank">
                                <categoryname>general.page</categoryname>
                                <optiontype>boolean</optiontype>

diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index 683455934db777df26c346cb8b52afa8f6b034da..642e2bc3614d30bd323c6de64d984589f8cbee0d 100644 (file)
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -376,6 +376,10 @@ class WCF {
                // https://github.com/WoltLab/WCF/issues/3330
                define('MESSAGE_SIDEBAR_ENABLE_USER_ONLINE_MARKING', 1);
                
+               // rel=nofollow is always applied to external link since 5.3
+               // https://github.com/WoltLab/WCF/issues/3339
+               define('EXTERNAL_LINK_REL_NOFOLLOW', 1);
+               
                $filename = WCF_DIR.'options.inc.php';
                
                // create options file if doesn't exist

diff --git a/wcfsetup/install/files/lib/system/html/output/node/HtmlOutputNodeA.class.php b/wcfsetup/install/files/lib/system/html/output/node/HtmlOutputNodeA.class.php
index 338dc88a6621ec636ee73c390926c05b7a678ee2..2c46cd12877a61ed7569e92ad3031f9f03076957 100644 (file)
--- a/wcfsetup/install/files/lib/system/html/output/node/HtmlOutputNodeA.class.php
+++ b/wcfsetup/install/files/lib/system/html/output/node/HtmlOutputNodeA.class.php
@@ -71,22 +71,13 @@ class HtmlOutputNodeA extends AbstractHtmlOutputNode {
        public static function markLinkAsExternal(\DOMElement $element) {
                $element->setAttribute('class', 'externalURL');
                
-               $rel = '';
-               if (EXTERNAL_LINK_REL_NOFOLLOW) {
-                       $rel = 'nofollow';
-               }
-               
+               $rel = 'nofollow';
                if (EXTERNAL_LINK_TARGET_BLANK) {
-                       if (!empty($rel)) $rel .= ' ';
-                       
-                       $rel .= 'noopener noreferrer';
+                       $rel .= ' noopener noreferrer';
                        
                        $element->setAttribute('target', '_blank');
                }
-               
-               if (!empty($rel)) {
-                       $element->setAttribute('rel', $rel);
-               }
+               $element->setAttribute('rel', $rel);
                
                // If the link contains only a single image that is floated to the right,
                // then the external link marker is misaligned. Inheriting the CSS class

diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 4b5097edc97dfc0eeedcbbd686488123349e4163..1b81e454aff0426b2694a761130dbb20f7de06b8 100644 (file)
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -1388,8 +1388,6 @@ ACHTUNG: Die oben genannten Meldungen sind stark gekürzt. Sie können Details z
                <item name="wcf.acp.option.enable_debug_mode.description"><![CDATA[Aktiviert ausführliche Fehlerberichte. Diese Option sollte im Live-Betrieb abgeschaltet werden.]]></item>
                <item name="wcf.acp.option.enable_production_debug_mode"><![CDATA[Problemanalyse im Live-Betrieb]]></item>
                <item name="wcf.acp.option.enable_production_debug_mode.description"><![CDATA[Hängt die aktuelle URL an Datenbankabfragen an, um diese im Log des Datenbankservers einfacher identifizieren zu können.]]></item>
-               <item name="wcf.acp.option.external_link_rel_nofollow"><![CDATA[Externe Links mit dem Attribut „rel="nofollow"“ versehen]]></item>
-               <item name="wcf.acp.option.external_link_rel_nofollow.description"><![CDATA[Das Attribut „rel="nofollow"“ weist Suchmaschinen an, einen bestimmten Link auf einer Seite zu ignorieren.]]></item>
                <item name="wcf.acp.option.external_link_target_blank"><![CDATA[Externe Links in neuem Fenster öffnen]]></item>
                <item name="wcf.acp.option.external_link_target_blank.description"><![CDATA[Setzt das Attribut „target="_blank"“ auf externe Links und weist den Browser dadurch an, einen aufgerufenen Link in einem neuen Browser-Fenster zu öffnen.]]></item>
                <item name="wcf.acp.option.enable_benchmark"><![CDATA[Benchmark aktivieren]]></item>

diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index d45d82840826adca593c6996227d3fe1be617cfc..741b849c83b6fc19916c5f9100a21aaa726728e2 100644 (file)
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -1365,8 +1365,6 @@ ATTENTION: The messages listed above are greatly shortened. You can view details
                <item name="wcf.acp.option.enable_debug_mode.description"><![CDATA[Enables extensive error messages, it should always be disabled in production environments!]]></item>
                <item name="wcf.acp.option.enable_production_debug_mode"><![CDATA[Problem analysis in production environments]]></item>
                <item name="wcf.acp.option.enable_production_debug_mode.description"><![CDATA[Appends the current URL to database queries to assist looking them up in the database server’s log files.]]></item>
-               <item name="wcf.acp.option.external_link_rel_nofollow"><![CDATA[Append the attribute “rel="nofollow"” to all external links]]></item>
-               <item name="wcf.acp.option.external_link_rel_nofollow.description"><![CDATA[The attribute “rel="nofollow"” tells search engines to disregard external links.]]></item>
                <item name="wcf.acp.option.external_link_target_blank"><![CDATA[Open external links in a new window]]></item>
                <item name="wcf.acp.option.external_link_target_blank.description"><![CDATA[Appends the attribute “target="_blank"” to external links, causing the user’s browser to open the link in a new window.]]></item>
                <item name="wcf.acp.option.enable_benchmark"><![CDATA[Enable benchmark]]></item>