From bfdc614f05cf349f6ebf908b227126bbe2376836 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim=20D=C3=BCsterhus?= Date: Tue, 31 May 2022 12:27:46 +0200 Subject: [PATCH] Remove incorrect use of `@` from WCFSetup templates Most of these values appear in attributes where `"` must be escaped. While the `"` cannot appear in some of the values, WCFSetup is not performance critical, so simply remove them everywhere to save the developer from needing to think about this. --- wcfsetup/setup/template/footer.tpl | 2 +- wcfsetup/setup/template/header.tpl | 4 ++-- wcfsetup/setup/template/stepConfigureDB.tpl | 8 ++++---- wcfsetup/setup/template/stepConfigureDirectories.tpl | 8 ++++---- wcfsetup/setup/template/stepCreateUser.tpl | 8 ++++---- wcfsetup/setup/template/stepNext.tpl | 10 +++++----- wcfsetup/setup/template/stepSelectSetupLanguage.tpl | 6 +++--- wcfsetup/setup/template/stepShowLicense.tpl | 8 ++++---- wcfsetup/setup/template/stepShowSystemRequirements.tpl | 8 ++++---- 9 files changed, 31 insertions(+), 31 deletions(-) diff --git a/wcfsetup/setup/template/footer.tpl b/wcfsetup/setup/template/footer.tpl index 82580bf002..edd82bef43 100644 --- a/wcfsetup/setup/template/footer.tpl +++ b/wcfsetup/setup/template/footer.tpl @@ -5,7 +5,7 @@ diff --git a/wcfsetup/setup/template/header.tpl b/wcfsetup/setup/template/header.tpl index 641c4d9957..9bc4a9a2d2 100644 --- a/wcfsetup/setup/template/header.tpl +++ b/wcfsetup/setup/template/header.tpl @@ -1,5 +1,5 @@ - + {lang}wcf.global.progressBar{/lang} - {lang}wcf.global.title{/lang} @@ -49,6 +49,6 @@

{lang}wcf.global.title{/lang}

-

{@$progress}%

+

{$progress}%

diff --git a/wcfsetup/setup/template/stepConfigureDB.tpl b/wcfsetup/setup/template/stepConfigureDB.tpl index 0329f8abb4..8650138c3e 100644 --- a/wcfsetup/setup/template/stepConfigureDB.tpl +++ b/wcfsetup/setup/template/stepConfigureDB.tpl @@ -42,10 +42,10 @@
- - - - + + + + {foreach from=$directories key=application item=directory} {/foreach} diff --git a/wcfsetup/setup/template/stepConfigureDirectories.tpl b/wcfsetup/setup/template/stepConfigureDirectories.tpl index c6f6b1b30e..40ea12ee25 100644 --- a/wcfsetup/setup/template/stepConfigureDirectories.tpl +++ b/wcfsetup/setup/template/stepConfigureDirectories.tpl @@ -45,10 +45,10 @@
- - - - + + + +
diff --git a/wcfsetup/setup/template/stepCreateUser.tpl b/wcfsetup/setup/template/stepCreateUser.tpl index eeccd62153..705c529f6c 100644 --- a/wcfsetup/setup/template/stepCreateUser.tpl +++ b/wcfsetup/setup/template/stepCreateUser.tpl @@ -77,10 +77,10 @@
- - - - + + + + {foreach from=$directories key=application item=directory} {/foreach} diff --git a/wcfsetup/setup/template/stepNext.tpl b/wcfsetup/setup/template/stepNext.tpl index 4157a7ef7b..c63f463176 100644 --- a/wcfsetup/setup/template/stepNext.tpl +++ b/wcfsetup/setup/template/stepNext.tpl @@ -7,17 +7,17 @@

{lang}wcf.global.next.description{/lang}

-
+
- - - + + + {foreach from=$directories key=application item=directory} {/foreach} {if $__additionalParameters|isset} {foreach from=$__additionalParameters key=__name item=__value} - + {/foreach} {/if}
diff --git a/wcfsetup/setup/template/stepSelectSetupLanguage.tpl b/wcfsetup/setup/template/stepSelectSetupLanguage.tpl index 8ed44835fa..30d115a303 100644 --- a/wcfsetup/setup/template/stepSelectSetupLanguage.tpl +++ b/wcfsetup/setup/template/stepSelectSetupLanguage.tpl @@ -21,9 +21,9 @@
- - - + + +
diff --git a/wcfsetup/setup/template/stepShowLicense.tpl b/wcfsetup/setup/template/stepShowLicense.tpl index 2b584b188f..eaaa52ed8f 100644 --- a/wcfsetup/setup/template/stepShowLicense.tpl +++ b/wcfsetup/setup/template/stepShowLicense.tpl @@ -23,10 +23,10 @@
- - - - + + + +
diff --git a/wcfsetup/setup/template/stepShowSystemRequirements.tpl b/wcfsetup/setup/template/stepShowSystemRequirements.tpl index 4d2a8b84b5..14414005d1 100644 --- a/wcfsetup/setup/template/stepShowSystemRequirements.tpl +++ b/wcfsetup/setup/template/stepShowSystemRequirements.tpl @@ -286,10 +286,10 @@
- - - - + + + +
-- 2.20.1