diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-06-18 15:59:39 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-06-18 15:59:39 +0200 |
| commit | 6bd0a158f7ae71320a1b0c00e187633200561269 (patch) | |
| tree | 52dd70f3c9d4e9fb22b58f450fb7cfb71af5efe7 /core | |
| parent | e31c9a7b6f88137810b541c7065660a6c0faa470 (diff) | |
| parent | 2f00384b5124ec0b3f3703d73a11a129aff93a62 (diff) | |
| download | nextcloud-server-6bd0a158f7ae71320a1b0c00e187633200561269.tar.gz nextcloud-server-6bd0a158f7ae71320a1b0c00e187633200561269.zip | |
Merge branch 'master' into oc_error
Diffstat (limited to 'core')
| -rw-r--r-- | core/minimizer.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/minimizer.php b/core/minimizer.php index 47e3d855e7b..0abbca75027 100644 --- a/core/minimizer.php +++ b/core/minimizer.php @@ -5,11 +5,11 @@ OC_App::loadApps(); if ($service == 'core.css'){ $minimizer = new OC_Minimizer_CSS(); - $files = $minimizer->findFiles(OC_Util::$core_styles); + $files = OC_TemplateLayout::findStylesheetFiles(OC_Util::$core_styles); $minimizer->output($files, $service); } else if ($service == 'core.js'){ $minimizer = new OC_Minimizer_JS(); - $files = $minimizer->findFiles(OC_Util::$core_scripts); + $files = OC_TemplateLayout::findJavascriptFiles(OC_Util::$core_scripts); $minimizer->output($files, $service); } |