From: Alexander Ebert <ebert@woltlab.com>
Date: Fri, 4 Mar 2016 12:24:25 +0000 (+0100)
Subject: Merge remote-tracking branch 'refs/remotes/origin/master' into next
X-Git-Tag: 3.0.0_Beta_1~2043
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=eb90babefa5910ecee018c56027484d2e7782a1c;p=GitHub%2FWoltLab%2FWCF.git

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
---

eb90babefa5910ecee018c56027484d2e7782a1c
diff --cc wcfsetup/install/files/lib/system/option/user/UserOptionHandler.class.php
index dac09beca7,5387eacdf0..fb7d581223
--- a/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]);
  				}
  			}