diff options
| author | Julius Härtl <jus@bitgrid.net> | 2018-03-07 12:11:03 +0100 |
|---|---|---|
| committer | Julius Härtl <jus@bitgrid.net> | 2018-03-09 09:24:07 +0100 |
| commit | a098b578179c1d7c307b1e97a34d15444ee33c35 (patch) | |
| tree | ada04ef0ce403d046f5b9de6b71b2d916a95cb6d | |
| parent | c4539c34c9ea78f2bc0fa5c038ebad247fd61fdc (diff) | |
| download | nextcloud-server-a098b578179c1d7c307b1e97a34d15444ee33c35.tar.gz nextcloud-server-a098b578179c1d7c307b1e97a34d15444ee33c35.zip | |
Use JSCombiner from server container when searching for JS files
Signed-off-by: Julius Härtl <jus@bitgrid.net>
| -rw-r--r-- | lib/private/TemplateLayout.php | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/lib/private/TemplateLayout.php b/lib/private/TemplateLayout.php index d37a8bbabbe..12b063d96e2 100644 --- a/lib/private/TemplateLayout.php +++ b/lib/private/TemplateLayout.php @@ -301,13 +301,7 @@ class TemplateLayout extends \OC_Template { $theme, array( \OC::$SERVERROOT => \OC::$WEBROOT ), array( \OC::$SERVERROOT => \OC::$WEBROOT ), - new JSCombiner( - \OC::$server->getAppDataDir('js'), - \OC::$server->getURLGenerator(), - \OC::$server->getMemCacheFactory()->createDistributed('JS'), - \OC::$server->getSystemConfig(), - \OC::$server->getLogger() - ) + \OC::$server->query(JSCombiner::class) ); $locator->find($scripts); return $locator->getResources(); |