Merge branch '3.0'

diff --cc wcfsetup/install/files/lib/data/option/Option.class.php
index 56a28f29c6ce1dc3914bf3ebc5b1914e513c2b3c,73a249aa21b039fab83ff5f1282b388f00344893..edda82d02fbe9027483e96e4868708667aad305f
--- 1/wcfsetup/install/files/lib/data/option/Option.class.php
--- 2/wcfsetup/install/files/lib/data/option/Option.class.php
+++ b/wcfsetup/install/files/lib/data/option/Option.class.php
@@@ -108,10 -91,10 +108,10 @@@ class Option extends DatabaseObject 
                $disableOptions = $enableOptions = '';
                
                if (!empty($optionData)) {
 -                      $options = explode(',', $optionData);
 +                      $options = ArrayUtil::trim(explode(',', $optionData));
                        
                        foreach ($options as $item) {
-                               if ($item{0} == '!') {
+                               if ($item[0] == '!') {
                                        if (!empty($disableOptions)) $disableOptions .= ',';
                                        $disableOptions .= "'".mb_substr($item, 1)."' ";
                                }

diff --cc wcfsetup/install/files/lib/system/html/input/node/HtmlInputNodeTextParser.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/system/option/CaptchaSelectOptionType.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/system/option/SelectOptionType.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/system/package/PackageInstallationNodeBuilder.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/util/StringUtil.class.php
Simple merge