Merge remote-tracking branch 'refs/remotes/origin/master' into next

# Conflicts:
#	com.woltlab.wcf/package.xml
#	wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js
#	wcfsetup/install/files/js/3rdParty/redactor/plugins/wcombined.min.js
#	wcfsetup/install/files/js/WCF.Combined.min.js
#	wcfsetup/install/files/lib/acp/page/ExceptionLogViewPage.class.php
#	wcfsetup/install/files/lib/system/WCF.class.php

#	wcfsetup/install/files/lib/system/option/user/UserOptionHandler.class.php

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

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

diff --cc wcfsetup/install/files/lib/data/notice/NoticeAction.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/page/MultipleLinkPage.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/system/option/user/UserOptionHandler.class.php
index dac09beca7b06a158a3e087c54d97dc9d4da5862,5387eacdf0b0e124703a1eb590b16b2fc7f92cea..fb7d5812237769e8191bed2be2ef40f05b32b00a
--- 1/wcfsetup/install/files/lib/system/option/user/UserOptionHandler.class.php
--- 2/wcfsetup/install/files/lib/system/option/user/UserOptionHandler.class.php
+++ b/wcfsetup/install/files/lib/system/option/user/UserOptionHandler.class.php
@@@ -265,7 -264,7 +265,7 @@@ class UserOptionHandler extends OptionH
                // remove options which are not asked during registration
                if ($this->inRegistration && !empty($options)) {
                        foreach ($this->options as $option) {
-                               if (!$option->askDuringRegistration && !($option->editable & UserOption::EDITABILITY_OWNER_DURING_REGISTRATION) && array_key_exists($option->optionID, $options)) {
 -                              if (array_key_exists($option->optionID, $options) && !$option->askDuringRegistration && !$option->required && ($option->optionName != 'birthday' || !REGISTER_MIN_USER_AGE)) {
++                              if (array_key_exists($option->optionID, $options) && !$option->askDuringRegistration && !($option->editable & UserOption::EDITABILITY_OWNER_DURING_REGISTRATION) && !$option->required && ($option->optionName != 'birthday' || !REGISTER_MIN_USER_AGE)) {
                                        unset($options[$option->optionID]);
                                }
                        }

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

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