Merge pull request #12019 from owncloud/fix-template-shortcuts

second parameter in template shortcuts script() and style() is optional
remotes/origin/fix-10825
Thomas Müller 11 years ago
commit 88c329b394
  1. 4
      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);

Loading…
Cancel
Save