From: Marcel Werk <burntime@woltlab.com>
Date: Fri, 27 Sep 2019 14:29:26 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 5.2.0_Beta_2~36
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=bcdb2d67a0c54044c5f64aeff232b0c5dc4009cb;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'master' into next
---

bcdb2d67a0c54044c5f64aeff232b0c5dc4009cb
diff --cc wcfsetup/install/files/acp/templates/boxAdd.tpl
index 1c466993a1,a821bf2ed3..16d172d9f1
--- a/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'}