From 07d6d92123d92b02d35c30f718b19cd387cb8ffb Mon Sep 17 00:00:00 2001
From: Matthias Schmidt <gravatronics@live.com>
Date: Fri, 23 Oct 2020 16:12:18 +0200
Subject: [PATCH] Remove meta keywords option

---
 com.woltlab.wcf/option.xml                                 | 6 +-----
 constants.php                                              | 1 -
 wcfsetup/install/files/lib/system/MetaTagHandler.class.php | 3 ---
 wcfsetup/install/files/lib/system/WCF.class.php            | 4 ++++
 wcfsetup/install/lang/de.xml                               | 1 -
 wcfsetup/install/lang/en.xml                               | 1 -
 6 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml
index cdac9ddef2..21e6b2c0ec 100644
--- a/com.woltlab.wcf/option.xml
+++ b/com.woltlab.wcf/option.xml
@@ -419,11 +419,6 @@
 				<optiontype>boolean</optiontype>
 				<defaultvalue>1</defaultvalue>
 			</option>
-			<option name="meta_keywords">
-				<categoryname>general.page</categoryname>
-				<optiontype>textI18n</optiontype>
-				<supporti18n>1</supporti18n>
-			</option>
 			<option name="meta_description">
 				<categoryname>general.page</categoryname>
 				<optiontype>textI18n</optiontype>
@@ -1719,5 +1714,6 @@ DESC:wcf.global.sortOrder.descending</selectoptions>
 		<option name="register_password_must_contain_upper_case" />
 		<option name="register_password_must_contain_digit" />
 		<option name="register_password_must_contain_special_char" />
+		<option name="meta_keywords" />
 	</delete>
 </data>
diff --git a/constants.php b/constants.php
index 58157cb8c4..74830a0b06 100644
--- a/constants.php
+++ b/constants.php
@@ -51,7 +51,6 @@ define('MODULE_POLL', 1);
 define('MODULE_WCF_AD', 0);
 define('PAGE_TITLE', 'WoltLab Suite');
 define('PAGE_DESCRIPTION', '');
-define('META_KEYWORDS', '');
 define('META_DESCRIPTION', '');
 define('SHOW_VERSION_NUMBER', 1);
 define('EXTERNAL_LINK_REL_NOFOLLOW', 1);
diff --git a/wcfsetup/install/files/lib/system/MetaTagHandler.class.php b/wcfsetup/install/files/lib/system/MetaTagHandler.class.php
index 280186e5b9..53d436c89d 100644
--- a/wcfsetup/install/files/lib/system/MetaTagHandler.class.php
+++ b/wcfsetup/install/files/lib/system/MetaTagHandler.class.php
@@ -37,9 +37,6 @@ class MetaTagHandler extends SingletonFactory implements \Countable, \Iterator {
 		if ($value = WCF::getLanguage()->get(META_DESCRIPTION)) {
 			$this->addTag('description', 'description', $value);
 		}
-		if ($value = WCF::getLanguage()->get(META_KEYWORDS)) {
-			$this->addTag('keywords', 'keywords', $value);
-		}
 		if ($value = WCF::getLanguage()->get(PAGE_TITLE)) {
 			$this->addTag('og:site_name', 'og:site_name', $value, true);
 		}
diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index 649b281780..062a7a5ac6 100644
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -401,6 +401,10 @@ class WCF {
 		// The session timeout is fully managed since 5.4.
 		define('SESSION_TIMEOUT', 3600);
 		
+		// Meta keywords are no longer used since 5.4.
+		// https://github.com/WoltLab/WCF/issues/3561
+		define('META_KEYWORDS', '');
+		
 		$filename = WCF_DIR.'options.inc.php';
 		
 		// create options file if doesn't exist
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index eeb6e361a0..577be3b506 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -1358,7 +1358,6 @@ ACHTUNG: Die oben genannten Meldungen sind stark gekürzt. Sie können Details z
 		<item name="wcf.acp.option.mail_use_f_param"><![CDATA[„-f“ Parameter verwenden]]></item>
 		<item name="wcf.acp.option.mail_use_f_param.description"><![CDATA[Der „-f“-Parameter sorgt bei der PHP-Versandmethode dafür, dass der korrekte Absender gesetzt wird. Diese Einstellung wird möglicherweise nicht von jedem Server unterstützt. {if LANGUAGE_USE_INFORMAL_VARIANT}Versuche{else}Versuchen Sie{/if} in diesem Falle die Option zu deaktivieren.]]></item>
 		<item name="wcf.acp.option.meta_description"><![CDATA[Meta Description]]></item>
-		<item name="wcf.acp.option.meta_keywords"><![CDATA[Meta Keywords]]></item>
 		<item name="wcf.acp.option.og_image"><![CDATA[Standardwert „Open Graph“-Bild]]></item>
 		<item name="wcf.acp.option.og_image.description"><![CDATA[Pfad zur Bilddatei, die beim Verlinken von Inhalten auf Facebook, Twitter und anderen „Social Media“-Seiten standardmäßig eingebunden wird.]]></item>
 		<item name="wcf.acp.option.module_master_password"><![CDATA[Hauptkennwort aktivieren]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 23abb23ecd..c20e910ab4 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -1335,7 +1335,6 @@ ATTENTION: The messages listed above are greatly shortened. You can view details
 		<item name="wcf.acp.option.mail_use_f_param"><![CDATA[Use “-f” parameter]]></item>
 		<item name="wcf.acp.option.mail_use_f_param.description"><![CDATA[The “-f” parameter sets the proper sender of the email if the PHP send method is used. This parameter may not be supported by every server. Try disabling it, if you have trouble sending emails.]]></item>
 		<item name="wcf.acp.option.meta_description"><![CDATA[Meta Description]]></item>
-		<item name="wcf.acp.option.meta_keywords"><![CDATA[Meta Keywords]]></item>
 		<item name="wcf.acp.option.og_image"><![CDATA[Open Graph Image]]></item>
 		<item name="wcf.acp.option.og_image.description"><![CDATA[Path to the default image that will be displayed when sharing your site on Facebook, Twitter and other social media sites.]]></item>
 		<item name="wcf.acp.option.module_master_password"><![CDATA[Enable master password]]></item>
-- 
2.20.1