Merge branch '5.2' into 5.3

diff --cc com.woltlab.wcf/templates/__aclFormField.tpl
index 66b47c108bfddb7dead76f5f9580283f98b376e5,9fbd05189346bbdd7e25ad7ae9a3ccc8bdab1942..a09076a9f7812775516542806434d403e1647819
--- 1/com.woltlab.wcf/templates/__aclFormField.tpl
--- 2/com.woltlab.wcf/templates/__aclFormField.tpl
+++ b/com.woltlab.wcf/templates/__aclFormField.tpl
@@@ -2,4 -2,4 +2,4 @@@
        {include file='aclPermissions'}
  {/if}
  
- {include file='aclPermissionJavaScript' containerID=$field->getPrefixedId()|concat:'Container' categoryName=$field->getCategoryName() objectID=$field->getObjectID() objectTypeID=$field->getObjectType()->objectTypeID aclFormBuilderMode=$field->getDocument()->isAjax()}
 -{include file='aclPermissionJavaScript' containerID=$field->getPrefixedId()|concat:'Container' categoryName=$field->getCategoryName() objectID=$field->getObjectID() objectTypeID=$field->getObjectType()->objectTypeID aclFormBuilderMode=true aclValuesFieldName=$field->getPrefixedId()}
++{include file='aclPermissionJavaScript' containerID=$field->getPrefixedId()|concat:'Container' categoryName=$field->getCategoryName() objectID=$field->getObjectID() objectTypeID=$field->getObjectType()->objectTypeID aclFormBuilderMode=$field->getDocument()->isAjax() aclValuesFieldName=$field->getPrefixedId()}

diff --cc wcfsetup/install/files/acp/templates/__aclFormField.tpl
index 66b47c108bfddb7dead76f5f9580283f98b376e5,9fbd05189346bbdd7e25ad7ae9a3ccc8bdab1942..a09076a9f7812775516542806434d403e1647819
--- 1/wcfsetup/install/files/acp/templates/__aclFormField.tpl
--- 2/wcfsetup/install/files/acp/templates/__aclFormField.tpl
+++ b/wcfsetup/install/files/acp/templates/__aclFormField.tpl
@@@ -2,4 -2,4 +2,4 @@@
        {include file='aclPermissions'}
  {/if}
  
- {include file='aclPermissionJavaScript' containerID=$field->getPrefixedId()|concat:'Container' categoryName=$field->getCategoryName() objectID=$field->getObjectID() objectTypeID=$field->getObjectType()->objectTypeID aclFormBuilderMode=$field->getDocument()->isAjax()}
 -{include file='aclPermissionJavaScript' containerID=$field->getPrefixedId()|concat:'Container' categoryName=$field->getCategoryName() objectID=$field->getObjectID() objectTypeID=$field->getObjectType()->objectTypeID aclFormBuilderMode=true aclValuesFieldName=$field->getPrefixedId()}
++{include file='aclPermissionJavaScript' containerID=$field->getPrefixedId()|concat:'Container' categoryName=$field->getCategoryName() objectID=$field->getObjectID() objectTypeID=$field->getObjectType()->objectTypeID aclFormBuilderMode=$field->getDocument()->isAjax() aclValuesFieldName=$field->getPrefixedId()}