Option cleanup

diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml
index 1a4f89fdcf91df116a98db13d99043a81e55d14e..0587d9d500c3d886cbac36e71dcd9f6ef7831f80 100644 (file)
--- a/com.woltlab.wcf/option.xml
+++ b/com.woltlab.wcf/option.xml
@@ -954,34 +954,6 @@ redis:cache_source_redis_host,!cache_source_memcached_host]]></enableoptions>
                                <suffix>pixel</suffix>
                        </option>
                        
-                       <!-- message.general -->
-                       <option name="enable_bbcodes_default_value">
-                               <categoryname>message.general</categoryname>
-                               <optiontype>boolean</optiontype>
-                               <defaultvalue>1</defaultvalue>
-                       </option>
-                       <option name="enable_html_default_value">
-                               <categoryname>message.general</categoryname>
-                               <optiontype>boolean</optiontype>
-                               <defaultvalue>0</defaultvalue>
-                       </option>
-                       <option name="enable_smilies_default_value">
-                               <categoryname>message.general</categoryname>
-                               <optiontype>boolean</optiontype>
-                               <defaultvalue>1</defaultvalue>
-                       </option>
-                       <option name="pre_parse_default_value">
-                               <categoryname>message.general</categoryname>
-                               <optiontype>boolean</optiontype>
-                               <defaultvalue>1</defaultvalue>
-                       </option>
-                       <option name="show_signature_default_value">
-                               <categoryname>message.general</categoryname>
-                               <optiontype>boolean</optiontype>
-                               <defaultvalue>1</defaultvalue>
-                       </option>
-                       <!-- /message.general -->
-                       
                        <!-- message.general.edit -->
                        <option name="module_edit_history">
                                <categoryname>message.general.edit</categoryname>
@@ -1588,6 +1560,12 @@ DESC:wcf.global.sortOrder.descending]]></selectoptions>
                <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" />
+               
                <optioncategory name="dashboard.content.recentActivities" />
                <optioncategory name="dashboard.sidebar.recentActivities" />
        </delete>

diff --git a/constants.php b/constants.php
index 4aed8ec072ce29ccf900a6e7d66bd5be85b4a471..756e99af73a1c8cf50994e3a6e0461555e778430 100644 (file)
--- a/constants.php
+++ b/constants.php
@@ -128,11 +128,6 @@ define('ATTACHMENT_ENABLE_THUMBNAILS', 1);
 define('ATTACHMENT_RETAIN_DIMENSIONS', 0);
 define('ATTACHMENT_THUMBNAIL_HEIGHT', 210);
 define('ATTACHMENT_THUMBNAIL_WIDTH', 280);
-define('ENABLE_BBCODES_DEFAULT_VALUE', 1);
-define('ENABLE_HTML_DEFAULT_VALUE', 0);
-define('ENABLE_SMILIES_DEFAULT_VALUE', 1);
-define('PRE_PARSE_DEFAULT_VALUE', 1);
-define('SHOW_SIGNATURE_DEFAULT_VALUE', 1);
 define('MODULE_EDIT_HISTORY', 1);
 define('EDIT_HISTORY_EXPIRATION', 90);
 define('ENABLE_SHARE_BUTTONS', 1);