From: Tim Düsterhus Date: Tue, 9 Feb 2016 19:13:14 +0000 (+0100) Subject: Merge commit 'd9ff0c' into next X-Git-Tag: 3.0.0_Beta_1~2053 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7ee2202c6d51f07615c005ec8c765ba62eb5188b;p=GitHub%2FWoltLab%2FWCF.git Merge commit 'd9ff0c' into next --- 7ee2202c6d51f07615c005ec8c765ba62eb5188b diff --cc wcfsetup/install/files/lib/system/option/user/UserOptionHandler.class.php index 3503cc83bf,be2e775cdd..dac09beca7 --- a/wcfsetup/install/files/lib/system/option/user/UserOptionHandler.class.php +++ b/wcfsetup/install/files/lib/system/option/user/UserOptionHandler.class.php @@@ -243,11 -246,13 +247,13 @@@ class UserOptionHandler extends OptionH } if ($this->editMode) { - return $option->isEditable(); + return $option->isEditable($this->inRegistration); } - else { + else if (!$this->conditionMode) { return $option->isVisible(); } + + return true; } /** diff --cc wcfsetup/install/lang/en.xml index 3d9bb85b44,ed8db8a1cb..2fb8071856 --- a/wcfsetup/install/lang/en.xml +++ b/wcfsetup/install/lang/en.xml @@@ -667,10 -665,10 +667,10 @@@ Examples for medium ID detection - + noticeName}â?]]> - + @@@ -1928,16 -1884,14 +1928,16 @@@ Errors are + - + + + + - - ++ + - - -