From 533948aa618e967d39449b1ba2f810d9477c719d Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Thu, 6 Aug 2020 22:37:05 +0200
Subject: [PATCH] Removed EXTERNAL_LINK_REL_NOFOLLOW

---
 com.woltlab.wcf/option.xml                        |  5 -----
 wcfsetup/install/files/lib/system/WCF.class.php   |  4 ++++
 .../html/output/node/HtmlOutputNodeA.class.php    | 15 +++------------
 wcfsetup/install/lang/de.xml                      |  2 --
 wcfsetup/install/lang/en.xml                      |  2 --
 5 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml
index 9fd0072be3..900cf74ee0 100644
--- 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 683455934d..642e2bc361 100644
--- 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 338dc88a66..2c46cd1287 100644
--- 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 4b5097edc9..1b81e454af 100644
--- 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 d45d828408..741b849c83 100644
--- 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>
-- 
2.20.1