From 85099417476f5e100827c1e40bf19baa67d8a002 Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Tue, 19 Jun 2018 12:14:35 +0200
Subject: [PATCH] `MODULE_ATTACHMENT` is now always enabled

Closes #2531
---
 com.woltlab.wcf/option.xml                    | 36 +------------------
 .../install/files/lib/system/WCF.class.php    | 14 +++++---
 2 files changed, 10 insertions(+), 40 deletions(-)

diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml
index 37f08a8095..09582cedda 100644
--- a/com.woltlab.wcf/option.xml
+++ b/com.woltlab.wcf/option.xml
@@ -328,12 +328,6 @@
 				<defaultvalue>1</defaultvalue>
 			</option>
 			
-			<option name="module_attachment">
-				<categoryname>module.content</categoryname>
-				<optiontype>boolean</optiontype>
-				<defaultvalue>1</defaultvalue>
-			</option>
-			
 			<option name="module_smiley">
 				<categoryname>module.customization</categoryname>
 				<optiontype>boolean</optiontype>
@@ -1673,34 +1667,6 @@ DESC:wcf.global.sortOrder.descending</selectoptions>
 	</import>
 	
 	<delete>
-		<option name="cache_source_memcached_use_pconnect" />
-		<option name="http_enable_no_cache_headers" />
-		<option name="http_gzip_level" />
-		<option name="enable_pluginstore_widget" />
-		<option name="mail_use_formatted_address" />
-		<option name="mail_debug_logfile_path" />
-		<option name="recent_activity_items" />
-		<option name="recent_activity_sidebar_items" />
-		<option name="enable_bbcodes_default_value" />
-		<option name="enable_html_default_value" />
-		<option name="enable_smilies_default_value" />
-		<option name="pre_parse_default_value" />
-		<option name="show_signature_default_value" />
-		<option name="module_dashboard_page" />
-		<option name="module_privacy_policy_page" />
-		<option name="show_clock" />
-		<option name="url_controller_replacement" />
-		<option name="share_buttons_show_count" />
-		<option name="max_avatar_width" />
-		<option name="max_avatar_height" />
-		<option name="message_sidebar_enable_rank" /> 
-		<option name="message_sidebar_enable_avatar" />
-		<option name="message_sidebar_enable_message_group_starter_icon" />
-		<option name="jquery_source" />
-		
-		<optioncategory name="dashboard.content.recentActivities" />
-		<optioncategory name="dashboard.sidebar.recentActivities" />
-		<optioncategory name="module.display" />
-		<optioncategory name="general.system.jquery" />
+		<option name="module_attachment" />
 	</delete>
 </data>
diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index 0309466c71..56cea4e473 100644
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -113,13 +113,13 @@ class WCF {
 	 * database object
 	 * @var	MySQLDatabase
 	 */
-	protected static $dbObj = null;
+	protected static $dbObj;
 	
 	/**
 	 * language object
 	 * @var	\wcf\data\language\Language
 	 */
-	protected static $languageObj = null;
+	protected static $languageObj;
 	
 	/**
 	 * overrides disabled debug mode
@@ -131,19 +131,19 @@ class WCF {
 	 * session object
 	 * @var	SessionHandler
 	 */
-	protected static $sessionObj = null;
+	protected static $sessionObj;
 	
 	/**
 	 * template object
 	 * @var	TemplateEngine
 	 */
-	protected static $tplObj = null;
+	protected static $tplObj;
 	
 	/**
 	 * true if Zend Opcache is loaded and enabled
 	 * @var	boolean
 	 */
-	protected static $zendOpcacheEnabled = null;
+	protected static $zendOpcacheEnabled;
 	
 	/**
 	 * force logout during destructor call
@@ -356,6 +356,10 @@ class WCF {
 	 * Loads the options file, automatically created if not exists.
 	 */
 	protected function loadOptions() {
+		// the attachment module is always enabled since 3.2
+		// https://github.com/WoltLab/WCF/issues/2531
+		define('MODULE_ATTACHMENT', 1);
+		
 		$filename = WCF_DIR.'options.inc.php';
 		
 		// create options file if doesn't exist
-- 
2.20.1