Merge branch 'master' into next

diff --cc wcfsetup/install/files/acp/templates/boxAdd.tpl
index 1c466993a108fcca11a0a2ba2f52a4d8c17da49b,a821bf2ed33e1625443a0a169e16086076a42337..16d172d9f18490f8b29969e7e30f913bf0196e28
--- 1/wcfsetup/install/files/acp/templates/boxAdd.tpl
--- 2/wcfsetup/install/files/acp/templates/boxAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/boxAdd.tpl
@@@ -198,12 -173,8 +198,15 @@@
                                                <label><input type="checkbox" id="showHeader" name="showHeader" value="1"{if $showHeader} checked{/if}> {lang}wcf.acp.box.showHeader{/lang}</label>
                                        </dd>
                                </dl>
++
 +                              <dl>
 +                                      <dt></dt>
 +                                      <dd>
 +                                              <label><input type="checkbox" id="isDisabled" name="isDisabled" value="1"{if $isDisabled} checked{/if}> {lang}wcf.acp.box.isDisabled{/lang}</label>
 +                                      </dd>
 +                              </dl>
+                               
+                               {event name='dataFields'}
                        </div>
                        
                        {if $boxType === 'system'}

diff --cc wcfsetup/install/files/lib/system/box/BoxHandler.class.php
Simple merge