Merge branch 'next' into attachment-autoscale

diff --cc com.woltlab.wcf/option.xml
Simple merge

diff --cc constants.php
index e9e482ee89d74dd7e225bf2af058655609f3e48e,fad8369f12a1581518e04910ceebed45f63d7567..ee4f6be08e1db72096ee7e017ea0a84d3855c863
--- 1/constants.php
--- 2/constants.php
+++ b/constants.php
@@@ -244,8 -244,16 +244,21 @@@ define('MESSAGE_SIDEBAR_ENABLE_ARTICLES
  define('IMAGE_PROXY_ENABLE_PRUNE', 1);
  define('SEARCH_ENABLE_PAGES', 1);
  define('SEARCH_ENABLE_ARTICLES', 1);
 +define("ATTACHMENT_IMAGE_AUTOSCALE", 1);
 +define("ATTACHMENT_IMAGE_AUTOSCALE_MAX_WIDTH", 1024);
 +define("ATTACHMENT_IMAGE_AUTOSCALE_MAX_HEIGHT", 1024);
 +define("ATTACHMENT_IMAGE_AUTOSCALE_FILE_TYPE", '');
 +define("ATTACHMENT_IMAGE_AUTOSCALE_QUALITY", 80);
+ define('LOG_MISSING_LANGUAGE_ITEMS', 0);
+ define('PRUNE_IP_ADDRESS', 30);
+ define('BREADCRUMBS_HOME_USE_PAGE_TITLE', 1);
+ define('CONTACT_FORM_ENABLE_ATTACHMENTS', 0);
+ define('CONTACT_FORM_PRUNE_ATTACHMENTS', 180);
+ define('IMAGE_EXTERNAL_SOURCE_WHITELIST', '');
+ define('SEARCH_MAX_COMBINED_TAGS', 3);
+ define('ENABLE_PRODUCTION_DEBUG_MODE', 0);
+ define('BLACKLIST_SFS_ENABLE', 1);
+ define('BLACKLIST_SFS_USERNAME', '90percentile');
+ define('BLACKLIST_SFS_EMAIL_ADDRESS', 'moreThanOnce');
+ define('BLACKLIST_SFS_IP_ADDRESS', '90percentile');
+ define('BLACKLIST_SFS_ACTION', 'disable');

diff --cc wcfsetup/install/files/js/WCF.js
Simple merge

diff --cc wcfsetup/install/files/js/WoltLabSuite/Core/FileUtil.js
Simple merge

diff --cc wcfsetup/install/files/js/require.config.js
index a806a75fd886e9c9b495dd1369151f09a7b53288,1986a377892f1ba612e9160e7c855b53c2837a4e..1af435138ce5b42e900166ae9993388ff4d02e47
--- 1/wcfsetup/install/files/js/require.config.js
--- 2/wcfsetup/install/files/js/require.config.js
+++ b/wcfsetup/install/files/js/require.config.js
@@@ -4,7 -4,7 +4,8 @@@ requirejs.config(
                enquire: '3rdParty/enquire',
                favico: '3rdParty/favico',
                'perfect-scrollbar': '3rdParty/perfect-scrollbar',
-               'Pica': '3rdParty/pica'
++              'Pica': '3rdParty/pica',
+               prism: '3rdParty/prism',
        },
        shim: {
                enquire: { exports: 'enquire' },

diff --cc wcfsetup/install/lang/de.xml
Simple merge

diff --cc wcfsetup/install/lang/en.xml
Simple merge