Merge branch '3.0' into 3.1

diff --cc com.woltlab.wcf/package.xml
index f7a1d756759c5793a457453bd1fa9c369418bc83,7c2a3ceaaf81dde206c6a3bc8968d680ef0d1939..79682218381a42001374e6222b21bfe0fd46062e
--- 1/com.woltlab.wcf/package.xml
--- 2/com.woltlab.wcf/package.xml
+++ b/com.woltlab.wcf/package.xml
@@@ -48,56 -43,175 +48,60 @@@
                <instruction type="script">acp/post_install.php</instruction>
        </instructions>
        
 -      <instructions type="update" fromversion="2.1.24">
 -              <instruction type="file">files_pre_update.tar</instruction>
 -              <instruction type="script">acp/update_com.woltlab.wcf_3.0_pre_sql.php</instruction>
 -              <instruction type="sql">update_part1.sql</instruction>
 -              
 -              <instruction type="script" run="standalone" flushCache="false">acp/update_com.woltlab.wcf_3.0_noop.php</instruction>
 -              
 -              <instruction type="file">files.tar</instruction>
 -              <instruction type="script" flushCache="false">acp/update_com.woltlab.wcf_3.0_appConfig.php</instruction>
 -              
 -              <instruction type="script" run="standalone" flushCache="false">acp/update_com.woltlab.wcf_3.0_columnLength.php</instruction>
 -              <instruction type="sql" run="standalone">update_1.sql</instruction>
 -              <instruction type="sql" run="standalone">update_2.sql</instruction>
 -              <instruction type="script" run="standalone" flushCache="false">acp/update_com.woltlab.wcf_3.0_dropColumns.php</instruction>
 -              <instruction type="sql" run="standalone">update_3.sql</instruction>
 -              <instruction type="sql" run="standalone">update_4.sql</instruction>
 -              <instruction type="sql" run="standalone">update_5.sql</instruction>
 -              
 -              <instruction type="acpTemplate">acptemplates.tar</instruction>
 -              <instruction type="template">templates.tar</instruction>
 -              <instruction type="language" run="standalone">language/*.xml</instruction>
 -              
 -              <instruction type="packageInstallationPlugin">packageInstallationPlugin.xml</instruction>
 -              <instruction type="objectTypeDefinition">objectTypeDefinition.xml</instruction>
 -              <instruction type="objectType">objectType.xml</instruction>
 -              <instruction type="aclOption">aclOption.xml</instruction>
 -              <instruction type="acpMenu">acpMenu.xml</instruction>
 -              <instruction type="acpSearchProvider">acpSearchProvider.xml</instruction>
 -              <instruction type="bbcode">bbcode.xml</instruction>
 -              <instruction type="clipboardAction">clipboardAction.xml</instruction>
 -              <instruction type="coreObject">coreObject.xml</instruction>
 -              <instruction type="cronjob">cronjob.xml</instruction>
 -              <instruction type="eventListener">eventListener.xml</instruction>
 -              <instruction type="option">option.xml</instruction>
 -              <instruction type="smiley">smiley.xml</instruction>
 -              <instruction type="userGroupOption">userGroupOption.xml</instruction>
 -              <instruction type="userNotificationEvent">userNotificationEvent.xml</instruction>
 -              <instruction type="userOption">userOption.xml</instruction>
 -              
 -              <instruction type="page">page.xml</instruction>
 -              <instruction type="menu">menu.xml</instruction>
 -              <instruction type="menuItem">menuItem.xml</instruction>
 -              <instruction type="box">box.xml</instruction>
 +      <instructions type="update" fromversion="3.0.*">
 +              <instruction type="file">files_pre_sql.tar</instruction>
                
 -              <instruction type="style">defaultStyle.tar</instruction>
 +              <!-- version guard -->
 +              <instruction type="script" flushCache="false">acp/update_com.woltlab.wcf_3.1_preUpdate.php</instruction>
                
 -              <instruction type="script">acp/update_com.woltlab.wcf_3.0_post_sql.php</instruction>
 -              <instruction type="script">acp/update_com.woltlab.wcf_preventMailAbuse.php</instruction>
 -      </instructions>
 -      <instructions type="update" fromversion="2.1.24 pl 1">
 -              <instruction type="file">files_pre_update.tar</instruction>
 -              <instruction type="script">acp/update_com.woltlab.wcf_3.0_pre_sql.php</instruction>
 -              <instruction type="sql">update_part1.sql</instruction>
 -              
 -              <instruction type="script" run="standalone" flushCache="false">acp/update_com.woltlab.wcf_3.0_noop.php</instruction>
 -              
 -              <instruction type="file">files.tar</instruction>
 -              <instruction type="script" flushCache="false">acp/update_com.woltlab.wcf_3.0_appConfig.php</instruction>
 -              
 -              <instruction type="script" run="standalone" flushCache="false">acp/update_com.woltlab.wcf_3.0_columnLength.php</instruction>
 -              <instruction type="sql" run="standalone">update_1.sql</instruction>
 -              <instruction type="sql" run="standalone">update_2.sql</instruction>
 -              <instruction type="script" run="standalone" flushCache="false">acp/update_com.woltlab.wcf_3.0_dropColumns.php</instruction>
 -              <instruction type="sql" run="standalone">update_3.sql</instruction>
 -              <instruction type="sql" run="standalone">update_4.sql</instruction>
 -              <instruction type="sql" run="standalone">update_5.sql</instruction>
 -              
 -              <instruction type="acpTemplate">acptemplates.tar</instruction>
 -              <instruction type="template">templates.tar</instruction>
 -              <instruction type="language" run="standalone">language/*.xml</instruction>
 -              
 -              <instruction type="packageInstallationPlugin">packageInstallationPlugin.xml</instruction>
 -              <instruction type="objectTypeDefinition">objectTypeDefinition.xml</instruction>
 -              <instruction type="objectType">objectType.xml</instruction>
 -              <instruction type="aclOption">aclOption.xml</instruction>
 -              <instruction type="acpMenu">acpMenu.xml</instruction>
 -              <instruction type="acpSearchProvider">acpSearchProvider.xml</instruction>
 -              <instruction type="bbcode">bbcode.xml</instruction>
 -              <instruction type="clipboardAction">clipboardAction.xml</instruction>
 -              <instruction type="coreObject">coreObject.xml</instruction>
 -              <instruction type="cronjob">cronjob.xml</instruction>
 -              <instruction type="eventListener">eventListener.xml</instruction>
 -              <instruction type="option">option.xml</instruction>
 -              <instruction type="smiley">smiley.xml</instruction>
 -              <instruction type="userGroupOption">userGroupOption.xml</instruction>
 -              <instruction type="userNotificationEvent">userNotificationEvent.xml</instruction>
 -              <instruction type="userOption">userOption.xml</instruction>
 -              
 -              <instruction type="page">page.xml</instruction>
 -              <instruction type="menu">menu.xml</instruction>
 -              <instruction type="menuItem">menuItem.xml</instruction>
 -              <instruction type="box">box.xml</instruction>
 +              <!-- prevent issues caused by early flushes of the `options.inc.php` -->
 +              <instruction type="option" />
                
 -              <instruction type="style">defaultStyle.tar</instruction>
 +              <instruction type="acpTemplate" />
 +              <instruction type="template" />
                
 -              <instruction type="script">acp/update_com.woltlab.wcf_3.0_post_sql.php</instruction>
 -              <instruction type="script">acp/update_com.woltlab.wcf_preventMailAbuse.php</instruction>
 -      </instructions>
 -      <instructions type="update" fromversion="2.1.24 pl 2">
 -              <instruction type="file">files_pre_update.tar</instruction>
 -              <instruction type="script">acp/update_com.woltlab.wcf_3.0_pre_sql.php</instruction>
 -              <instruction type="sql">update_part1.sql</instruction>
 -              
 -              <instruction type="script" run="standalone" flushCache="false">acp/update_com.woltlab.wcf_3.0_noop.php</instruction>
 -              
 -              <instruction type="file">files.tar</instruction>
 -              <instruction type="script" flushCache="false">acp/update_com.woltlab.wcf_3.0_appConfig.php</instruction>
 -              
 -              <instruction type="script" run="standalone" flushCache="false">acp/update_com.woltlab.wcf_3.0_columnLength.php</instruction>
 -              <instruction type="sql" run="standalone">update_1.sql</instruction>
 -              <instruction type="sql" run="standalone">update_2.sql</instruction>
 -              <instruction type="script" run="standalone" flushCache="false">acp/update_com.woltlab.wcf_3.0_dropColumns.php</instruction>
 -              <instruction type="sql" run="standalone">update_3.sql</instruction>
 -              <instruction type="sql" run="standalone">update_4.sql</instruction>
 -              <instruction type="sql" run="standalone">update_5.sql</instruction>
 -              
 -              <instruction type="acpTemplate">acptemplates.tar</instruction>
 -              <instruction type="template">templates.tar</instruction>
 -              <instruction type="language" run="standalone">language/*.xml</instruction>
 -              
 -              <instruction type="packageInstallationPlugin">packageInstallationPlugin.xml</instruction>
 -              <instruction type="objectTypeDefinition">objectTypeDefinition.xml</instruction>
 -              <instruction type="objectType">objectType.xml</instruction>
 -              <instruction type="aclOption">aclOption.xml</instruction>
 -              <instruction type="acpMenu">acpMenu.xml</instruction>
 -              <instruction type="acpSearchProvider">acpSearchProvider.xml</instruction>
 -              <instruction type="bbcode">bbcode.xml</instruction>
 -              <instruction type="clipboardAction">clipboardAction.xml</instruction>
 -              <instruction type="coreObject">coreObject.xml</instruction>
 -              <instruction type="cronjob">cronjob.xml</instruction>
 -              <instruction type="eventListener">eventListener.xml</instruction>
 -              <instruction type="option">option.xml</instruction>
 -              <instruction type="smiley">smiley.xml</instruction>
 -              <instruction type="userGroupOption">userGroupOption.xml</instruction>
 -              <instruction type="userNotificationEvent">userNotificationEvent.xml</instruction>
 -              <instruction type="userOption">userOption.xml</instruction>
 -              
 -              <instruction type="page">page.xml</instruction>
 -              <instruction type="menu">menu.xml</instruction>
 -              <instruction type="menuItem">menuItem.xml</instruction>
 -              <instruction type="box">box.xml</instruction>
 +              <instruction type="script" run="standalone" flushCache="false">acp/update_com.woltlab.wcf_3.1_addColumn.php</instruction>
                
 -              <instruction type="style">defaultStyle.tar</instruction>
 +              <instruction type="sql" run="standalone">update_3.1_1.sql</instruction>
 +              <instruction type="sql" run="standalone">update_3.1_2.sql</instruction>
 +              <instruction type="sql" run="standalone">update_3.1_3.sql</instruction>
 +              <instruction type="sql" run="standalone">update_3.1_4.sql</instruction>
                
 -              <instruction type="script">acp/update_com.woltlab.wcf_3.0_post_sql.php</instruction>
 -              <instruction type="script">acp/update_com.woltlab.wcf_preventMailAbuse.php</instruction>
 -      </instructions>
 -      
 -      <!-- Include: <instruction type="script">acp/update_com.woltlab.wcf_preventMailAbuse.php</instruction> -->
 -      
 -      <instructions type="update" fromversion="3.0.22">
 -              <instruction type="acpTemplate">acptemplates_update.tar</instruction>
 -              <instruction type="file">files_update.tar</instruction>
 -              <instruction type="template">templates_update.tar</instruction>
 +              <instruction type="file" run="standalone" />
                
 -              <instruction type="language" />
 +              <instruction type="language" run="standalone" />
                
 -              <instruction type="page" />
 -      </instructions>
 -      <instructions type="update" fromversion="3.0.22 pl 1">
 -              <instruction type="acpTemplate">acptemplates_update.tar</instruction>
 -              <instruction type="file">files_update.tar</instruction>
 -              <instruction type="template">templates_update.tar</instruction>
 +              <instruction type="acpMenu" />
 +              <instruction type="bbcode" />
 +              <instruction type="clipboardAction" />
 +              <instruction type="cronjob" />
 +              <instruction type="eventListener" />
 +              <instruction type="objectTypeDefinition" />
 +              <instruction type="objectType" />
 +              <instruction type="userGroupOption" />
 +              <instruction type="userNotificationEvent" />
 +              <instruction type="userOption" />
                
 -              <instruction type="language" />
 +              <instruction type="script" run="standalone" flushCache="false">acp/update_com.woltlab.wcf_3.1_pageSearchIndex.php</instruction>
                
                <instruction type="page" />
 +              <!-- contains a reference to a new page -->
 +              <instruction type="menuItem" />
 +              
 +              <instruction type="packageInstallationPlugin" />
 +              <!-- new pip -->
 +              <instruction type="mediaProvider" />
 +              
 +              <instruction type="script" run="standalone" flushCache="false">acp/update_com.woltlab.wcf_3.1_postUpgrade.php</instruction>
 +              
 +              <instruction type="style">defaultStyle.tar</instruction>
++              
++              <instruction type="script">acp/update_com.woltlab.wcf_preventMailAbuse.php</instruction>
        </instructions>
 -      <instructions type="update" fromversion="3.0.22 pl 2">
 +      
++      <!-- Include: <instruction type="script">acp/update_com.woltlab.wcf_preventMailAbuse.php</instruction> -->
++      
 +      <instructions type="update" fromversion="3.1.11">
                <instruction type="acpTemplate">acptemplates_update.tar</instruction>
                <instruction type="file">files_update.tar</instruction>
                <instruction type="template">templates_update.tar</instruction>

diff --cc wcfsetup/install/files/lib/form/MailForm.class.php
Simple merge