Skip to content

Commit 16fc2e0

Browse files
CyperghostCyperghost
committed
- Remove unnecessary @
- Use `unsafe:` instead of `@` - Use the `time` TemplatePlugin and no longer the deprecated `time` or `date` TemplateModifier.
1 parent 21bb6f6 commit 16fc2e0

13 files changed

Lines changed: 26 additions & 26 deletions

‎wcfsetup/install/files/acp/templates/devtoolsMissingLanguageItemList.tpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
<td class="columnID">{$logEntry->getObjectID()}</td>
5858
<td class="columnText">{if $logEntry->getLanguage()}{$logEntry->getLanguage()}{else}{$logEntry->languageID}{/if}</td>
5959
<td class="columnText">{$logEntry->languageItem}</td>
60-
<td class="columnDate">{@$logEntry->lastTime|time}</td>
60+
<td class="columnDate">{time time=$logEntry->lastTime}</td>
6161
</tr>
6262
{/foreach}
6363
</tbody>

‎wcfsetup/install/files/acp/templates/optionFieldList.tpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
</label>
2828
{/if}
2929
</dt>
30-
<dd>{@$optionData[html]}
30+
<dd>{unsafe:$optionData[html]}
3131
{if $error}
3232
<small class="innerError">
3333
{if $error == 'empty'}

‎wcfsetup/install/files/acp/templates/package.tpl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<ul>
2121
{content}
2222
{if $package->canUninstall()}
23-
<li><button type="button" class="button jsUninstallButton" data-object-id="{@$package->packageID}" data-confirm-message="{lang __encode=true}wcf.acp.package.uninstallation.confirm{/lang}" data-is-required="{if $package->isRequired()}true{else}false{/if}" data-is-application="{if $package->isApplication}true{else}false{/if}">{icon name='xmark'} <span>{lang}wcf.acp.package.button.uninstall{/lang}</span></button></li>
23+
<li><button type="button" class="button jsUninstallButton" data-object-id="{$package->packageID}" data-confirm-message="{lang __encode=true}wcf.acp.package.uninstallation.confirm{/lang}" data-is-required="{if $package->isRequired()}true{else}false{/if}" data-is-application="{if $package->isApplication}true{else}false{/if}">{icon name='xmark'} <span>{lang}wcf.acp.package.button.uninstall{/lang}</span></button></li>
2424
{/if}
2525

2626
<li><a href="{link controller='PackageList'}{/link}" class="button">{icon name='list'} <span>{lang}wcf.acp.menu.link.package.list{/lang}</span></a></li>
@@ -63,15 +63,15 @@
6363
</dl>
6464
<dl>
6565
<dt>{lang}wcf.acp.package.packageDate{/lang}</dt>
66-
<dd>{@$package->packageDate|date}</dd>
66+
<dd>{time time=$package->packageDate type='plainDate'}</dd>
6767
</dl>
6868
<dl>
6969
<dt>{lang}wcf.acp.package.installDate{/lang}</dt>
70-
<dd>{@$package->installDate|time}</dd>
70+
<dd>{time time=$package->installDate}</dd>
7171
</dl>
7272
<dl>
7373
<dt>{lang}wcf.acp.package.updateDate{/lang}</dt>
74-
<dd>{@$package->updateDate|time}</dd>
74+
<dd>{time time=$package->updateDate}</dd>
7575
</dl>
7676
{if $package->packageURL != ''}
7777
<dl>

‎wcfsetup/install/files/acp/templates/packageEnableUpgradeOverride.tpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@
1515
</nav>
1616
</header>
1717

18-
{@$form->getHtml()}
18+
{unsafe:$form->getHtml()}
1919

2020
{include file='footer'}

‎wcfsetup/install/files/acp/templates/packageEnableUpgradeOverrideIssues.tpl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<ul class="nativeList">
33
{foreach from=$issues item='issue'}
44
<li>
5-
<strong>{@$issue['title']}</strong><br>
6-
{@$issue['description']}
5+
<strong>{unsafe:$issue['title']}</strong><br>
6+
{unsafe:$issue['description']}
77
</li>
88
{/foreach}
99
</ul>

‎wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{capture assign='pageTitle'}{lang}wcf.acp.package.{@$queue->action}.title{/lang}: {$archive->getLocalizedPackageInfo('packageName')}{/capture}
1+
{capture assign='pageTitle'}{lang}wcf.acp.package.{$queue->action}.title{/lang}: {$archive->getLocalizedPackageInfo('packageName')}{/capture}
22
{include file='header'}
33

44
<script data-relocate="true">
@@ -10,15 +10,15 @@
1010
'wcf.acp.package.update.title': '{jslang}wcf.acp.package.update.title{/jslang}'
1111
});
1212
13-
new WCF.ACP.Package.Installation({@$queue->queueID}, undefined, {if $queue->action == 'install'}{if $queue->isApplication}false{else}true{/if}, false{else}false, true{/if});
13+
new WCF.ACP.Package.Installation({$queue->queueID}, undefined, {if $queue->action == 'install'}{if $queue->isApplication}false{else}true{/if}, false{else}false, true{/if});
1414
15-
new WCF.ACP.Package.Installation.Cancel({@$queue->queueID});
15+
new WCF.ACP.Package.Installation.Cancel({$queue->queueID});
1616
});
1717
</script>
1818

1919
<header class="contentHeader">
2020
<div class="contentHeaderTitle">
21-
<h1 class="contentTitle">{lang}wcf.acp.package.{@$queue->action}.title{/lang}: {$archive->getLocalizedPackageInfo('packageName')}</h1>
21+
<h1 class="contentTitle">{lang}wcf.acp.package.{$queue->action}.title{/lang}: {$archive->getLocalizedPackageInfo('packageName')}</h1>
2222
<p class="contentHeaderDescription">{$archive->getLocalizedPackageInfo('packageDescription')}</p>
2323
</div>
2424
</header>
@@ -46,7 +46,7 @@
4646

4747
<dl>
4848
<dt>{lang}wcf.acp.package.packageDate{/lang}</dt>
49-
<dd>{@$archive->getPackageInfo('date')|date}</dd>
49+
<dd>{time time=$archive->getPackageInfo('date') type='plainDate'}</dd>
5050
</dl>
5151

5252
{if $archive->getPackageInfo('packageURL') != ''}
@@ -82,7 +82,7 @@
8282
{foreach from=$packageValidationArchives item=packageValidationArchive}
8383
{assign var=exceptionMessage value=$packageValidationArchive->getExceptionMessage()}
8484
<tr>
85-
<td class="columnTitle columnPackageName"><span{if $packageValidationArchive->getDepth()} style="padding-left: {@$packageValidationArchive->getDepth() * 14}px"{/if}>{$packageValidationArchive->getArchive()->getLocalizedPackageInfo('packageName')}</span></td>
85+
<td class="columnTitle columnPackageName"><span{if $packageValidationArchive->getDepth()} style="padding-left: {$packageValidationArchive->getDepth() * 14}px"{/if}>{$packageValidationArchive->getArchive()->getLocalizedPackageInfo('packageName')}</span></td>
8686
<td class="columnText columnPackage">{$packageValidationArchive->getArchive()->getPackageInfo('name')}</td>
8787
<td class="columnIcon columnStatus">
8888
{if $exceptionMessage}
@@ -95,7 +95,7 @@
9595

9696
{if $exceptionMessage}
9797
<tr>
98-
<td colspan="3"><span{if $packageValidationArchive->getDepth()} style="padding-left: {@$packageValidationArchive->getDepth() * 14}px"{/if}>{@$exceptionMessage}</span></td>
98+
<td colspan="3"><span{if $packageValidationArchive->getDepth()} style="padding-left: {$packageValidationArchive->getDepth() * 14}px"{/if}>{unsafe:$exceptionMessage}</span></td>
9999
</tr>
100100
{/if}
101101
{/foreach}

‎wcfsetup/install/files/acp/templates/packageInstallationSetup.tpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
$(function() {
1111
WCF.Language.add('wcf.acp.package.install.title', '{jslang}wcf.acp.package.install.title{/jslang}');
1212
13-
var $installation = new WCF.ACP.Package.Installation({@$queueID});
13+
var $installation = new WCF.ACP.Package.Installation({$queueID});
1414
$installation.prepareInstallation();
1515
});
1616
</script>

‎wcfsetup/install/files/acp/templates/packageInstallationStepPrepare.tpl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
</span>
66

77
<div>
8-
<h1 class="contentTitle">{lang}wcf.acp.package.{@$installationType}.title{/lang}</h1>
9-
<p id="packageInstallationAction">{lang}wcf.acp.package.{@$installationType}.step.prepare{/lang}</span></p>
8+
<h1 class="contentTitle">{lang}wcf.acp.package.{$installationType}.title{/lang}</h1>
9+
<p id="packageInstallationAction">{lang}wcf.acp.package.{$installationType}.step.prepare{/lang}</span></p>
1010
<small><progress id="packageInstallationProgress" value="0" max="100">0%</progress> <span id="packageInstallationProgressLabel">0%</span></small>
1111
</div>
1212
</header>

‎wcfsetup/install/files/acp/templates/packageSearchResultListItems.tpl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
<div class="packageSearchDescription small">{$package->packageDescription}</div>
99
<span class="packageSearchPackage small">{$package->package}</span>
1010
{if $package->pluginStoreFileID}
11-
<span class="packageSearchPluginStorePage separatorLeft small"><a href="https://pluginstore.woltlab.com/file/{@$package->pluginStoreFileID}/" class="externalURL jsTooltip" title="{lang}wcf.acp.package.pluginStore.file.link{/lang}"{if EXTERNAL_LINK_TARGET_BLANK} target="_blank" rel="noopener"{/if}>{lang}wcf.acp.package.pluginStore.file{/lang}</a></span>
11+
<span class="packageSearchPluginStorePage separatorLeft small"><a href="https://pluginstore.woltlab.com/file/{$package->pluginStoreFileID}/" class="externalURL jsTooltip" title="{lang}wcf.acp.package.pluginStore.file.link{/lang}"{if EXTERNAL_LINK_TARGET_BLANK} target="_blank" rel="noopener"{/if}>{lang}wcf.acp.package.pluginStore.file{/lang}</a></span>
1212
{/if}
1313
</td>
1414
<td class="columnText small packageSearchAuthor{if $package->getUpdateServer()->isWoltLabUpdateServer()} packageSearchAuthorWoltlab{/if}" title="{$package->author}">{if $package->authorURL}<a href="{$package->authorURL}" class="externalURL"{if EXTERNAL_LINK_TARGET_BLANK} target="_blank" rel="noopener"{/if}>{$package->author|truncate:30}</a>{else}{$package->author|truncate:30}{/if}</td>
1515
<td class="columnText small packageSearchLicense" title="{$package->getAccessibleVersion()->license}">{if $package->getAccessibleVersion()->licenseURL}<a href="{$package->getAccessibleVersion()->licenseURL}" class="externalURL"{if EXTERNAL_LINK_TARGET_BLANK} target="_blank" rel="noopener"{/if}>{$package->getAccessibleVersion()->license|truncate:30}</a>{else}{$package->getAccessibleVersion()->license|truncate:30}{/if}</td>
16-
<td class="columnDate packageSearchDate">{@$package->getAccessibleVersion()->packageDate|time}</td>
16+
<td class="columnDate packageSearchDate">{time time=$package->getAccessibleVersion()->packageDate}</td>
1717
</tr>
1818
{/foreach}

‎wcfsetup/install/files/acp/templates/packageStartInstall.tpl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
<header class="contentHeader">
3030
<div class="contentHeaderTitle">
31-
<h1 class="contentTitle">{lang}{@$pageTitle}{/lang}</h1>
31+
<h1 class="contentTitle">{lang}{$pageTitle}{/lang}</h1>
3232
</div>
3333

3434
<nav class="contentHeaderNavigation">
@@ -112,7 +112,7 @@
112112
{if $errorType == 'empty'}
113113
{lang}wcf.global.form.error.empty{/lang}
114114
{else}
115-
{lang}wcf.acp.package.error.{@$errorType}{/lang}
115+
{lang}wcf.acp.package.error.{$errorType}{/lang}
116116
{/if}
117117
</small>
118118
{/if}

0 commit comments

Comments
 (0)