diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-11-07 11:01:10 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-11-07 11:01:10 +0100 |
| commit | 88c329b394e9a8cddda65b6e3645f7d6dcff279f (patch) | |
| tree | 30cf91fbae59af0433cfeda9831ed6a9d1aa159b | |
| parent | 7d47d5072412fa99fb3ed9fa17a5716350215ddc (diff) | |
| parent | 81e6329c049e93dcda4b8af2b6cdecdebf8b574d (diff) | |
| download | nextcloud-server-88c329b394e9a8cddda65b6e3645f7d6dcff279f.tar.gz nextcloud-server-88c329b394e9a8cddda65b6e3645f7d6dcff279f.zip | |
Merge pull request #12019 from owncloud/fix-template-shortcuts
second parameter in template shortcuts script() and style() is optional
| -rw-r--r-- | lib/private/template/functions.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/template/functions.php b/lib/private/template/functions.php index e9f9f39c191..4172d47ba61 100644 --- a/lib/private/template/functions.php +++ b/lib/private/template/functions.php @@ -29,7 +29,7 @@ function print_unescaped($string) { * @param string|string[] $file the filename, * if an array is given it will add all scripts */ -function script($app, $file) { +function script($app, $file = null) { if(is_array($file)) { foreach($file as $f) { OC_Util::addScript($app, $f); @@ -61,7 +61,7 @@ function vendor_script($app, $file = null) { * @param string|string[] $file the filename, * if an array is given it will add all styles */ -function style($app, $file) { +function style($app, $file = null) { if(is_array($file)) { foreach($file as $f) { OC_Util::addStyle($app, $f); |