diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2021-05-18 11:27:56 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-18 11:27:56 +0300 |
| commit | f4d543b2de2185c675f50ec88e35d9d71ec2372c (patch) | |
| tree | 290609944804b3622da7dbe8b3f47e036c7d968f | |
| parent | 321f01e2c5230add87d921f38d77ea12047b5f26 (diff) | |
| parent | d88785118337ae395eac03236a20d5979de77938 (diff) | |
Merge pull request #27007 from francoisfreitag/script
Prefer string $file over 1-element array in script()
7 files changed, 7 insertions, 21 deletions
diff --git a/apps/dav/templates/settings-admin-caldav.php b/apps/dav/templates/settings-admin-caldav.php index bf1e5a0fda1..75d44c23a38 100644 --- a/apps/dav/templates/settings-admin-caldav.php +++ b/apps/dav/templates/settings-admin-caldav.php @@ -21,9 +21,7 @@ * */ -script('dav', [ - 'settings-admin-caldav' -]); +script('dav', 'settings-admin-caldav'); /** @var \OCP\IL10N $l */ /** @var array $_ */ diff --git a/apps/settings/templates/settings/personal/security/authtokens.php b/apps/settings/templates/settings/personal/security/authtokens.php index 1db0d91fe69..e90698f5eaf 100644 --- a/apps/settings/templates/settings/personal/security/authtokens.php +++ b/apps/settings/templates/settings/personal/security/authtokens.php @@ -22,9 +22,7 @@ declare(strict_types=1); * */ -script('settings', [ - 'vue-settings-personal-security', -]); +script('settings', 'vue-settings-personal-security'); ?> diff --git a/apps/settings/templates/settings/personal/security/webauthn.php b/apps/settings/templates/settings/personal/security/webauthn.php index 268e06aef7d..74e219a5211 100644 --- a/apps/settings/templates/settings/personal/security/webauthn.php +++ b/apps/settings/templates/settings/personal/security/webauthn.php @@ -22,9 +22,7 @@ declare(strict_types=1); * */ -script('settings', [ - 'vue-settings-personal-webauthn', -]); +script('settings', 'vue-settings-personal-webauthn'); ?> diff --git a/apps/systemtags/templates/admin.php b/apps/systemtags/templates/admin.php index 27fad5bc47b..33e5f2b061d 100644 --- a/apps/systemtags/templates/admin.php +++ b/apps/systemtags/templates/admin.php @@ -19,9 +19,7 @@ * */ -script('core', [ - 'dist/systemtags', -]); +script('core', 'dist/systemtags'); script('systemtags', 'admin'); style('systemtags', 'settings'); diff --git a/apps/user_ldap/templates/renewpassword.php b/apps/user_ldap/templates/renewpassword.php index dca7a459c83..752327ce872 100644 --- a/apps/user_ldap/templates/renewpassword.php +++ b/apps/user_ldap/templates/renewpassword.php @@ -1,8 +1,6 @@ <?php /** @var \OCP\IL10N $l */ ?> <?php -script('user_ldap', [ - 'renewPassword', -]); +script('user_ldap', 'renewPassword'); style('user_ldap', 'renewPassword'); ?> diff --git a/apps/workflowengine/lib/Listener/LoadAdditionalSettingsScriptsListener.php b/apps/workflowengine/lib/Listener/LoadAdditionalSettingsScriptsListener.php index f852dea6a24..b01afbdadee 100644 --- a/apps/workflowengine/lib/Listener/LoadAdditionalSettingsScriptsListener.php +++ b/apps/workflowengine/lib/Listener/LoadAdditionalSettingsScriptsListener.php @@ -40,9 +40,7 @@ class LoadAdditionalSettingsScriptsListener implements IEventListener { class_exists(Template::class, true); } - script('core', [ - 'dist/systemtags', - ]); + script('core', 'dist/systemtags'); script(Application::APP_ID, [ 'workflowengine', diff --git a/core/templates/installation.php b/core/templates/installation.php index b9ab19f0357..5bdf8b0cc96 100644 --- a/core/templates/installation.php +++ b/core/templates/installation.php @@ -1,7 +1,5 @@ <?php -script('core', [ - 'dist/install' -]); +script('core', 'dist/install'); ?> <input type='hidden' id='hasMySQL' value='<?php p($_['hasMySQL']) ?>'> <input type='hidden' id='hasSQLite' value='<?php p($_['hasSQLite']) ?>'> |