Rename template include

diff --git a/com.woltlab.wcf/templates/shared_checkboxFormField.tpl b/com.woltlab.wcf/templates/shared_checkboxFormField.tpl
index e372c503b78ab3a84ee9baf553dd0734e8e0946a..513c507675c8ae2a852f3da63bed4321ded723bc 100644 (file)
--- a/com.woltlab.wcf/templates/shared_checkboxFormField.tpl
+++ b/com.woltlab.wcf/templates/shared_checkboxFormField.tpl
@@ -14,10 +14,10 @@
                        *}>
                        {@$field->getLabel()}{if $field->isRequired()} <span class="formFieldRequired">*</span>{/if}
                </label>
-               
-               {include file='__formFieldDescription'}
-               {include file='__formFieldErrors'}
-               {include file='__formFieldDependencies'}
-               {include file='__formFieldDataHandler'}
+
+               {include file='shared_formFieldDescription'}
+               {include file='shared_formFieldErrors'}
+               {include file='shared_formFieldDependencies'}
+               {include file='shared_formFieldDataHandler'}
        </dd>
 </dl>

diff --git a/com.woltlab.wcf/templates/shared_formField.tpl b/com.woltlab.wcf/templates/shared_formField.tpl
index 8bd4d103e5b7b4b36eb491793c3d87c5ae2d7ba1..9a3f40c80a9f99779d5622aecb55a73cab953cf1 100644 (file)
--- a/com.woltlab.wcf/templates/shared_formField.tpl
+++ b/com.woltlab.wcf/templates/shared_formField.tpl
@@ -6,10 +6,10 @@
        <dt>{if $field->getLabel() !== null}<label for="{$field->getPrefixedId()}">{@$field->getLabel()}</label>{if $field->isRequired() && $form->marksRequiredFields()} <span class="formFieldRequired">*</span>{/if}{/if}</dt>
        <dd>
                {@$field->getFieldHtml()}
-               
-               {include file='__formFieldErrors'}
-               {include file='__formFieldDescription'}
-               {include file='__formFieldDependencies'}
-               {include file='__formFieldDataHandler'}
+
+               {include file='shared_formFieldErrors'}
+               {include file='shared_formFieldDescription'}
+               {include file='shared_formFieldDependencies'}
+               {include file='shared_formFieldDataHandler'}
        </dd>
 </dl>

diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index a4b7d70c50075ba825a5b0f53addda7116b1fda7..a3c38d11b3eb6d8df7c9de720cb5eb2f2a1e82d7 100644 (file)
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -8,8 +8,6 @@ use wcf\data\package\Package;
 use wcf\data\package\PackageCache;
 use wcf\data\package\PackageEditor;
 use wcf\data\page\Page;
-use wcf\data\page\PageCache;
-use wcf\page\CmsPage;
 use wcf\system\application\ApplicationHandler;
 use wcf\system\application\IApplication;
 use wcf\system\box\BoxHandler;
@@ -750,7 +748,7 @@ class WCF
             $wcf = new TemplateScriptingCore($wcf);
         }
         $tplEngines = [self::getTPL(), SharedTemplateEngine::getInstance()];
-
+        /** @var TemplateEngine[] $tplEngines */
         foreach ($tplEngines as $tplEngine) {
             $tplEngine->registerPrefilter(['event', 'hascontent', 'lang', 'jsphrase', 'jslang', 'csrfToken', 'icon']);
             $tplEngine->assign([