summaryrefslogtreecommitdiffstats
path: root/lib/private/templatelayout.php
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@owncloud.com>2015-03-04 13:24:24 +0100
committerJoas Schilling <nickvergessen@owncloud.com>2015-03-04 17:56:33 +0100
commit716ba49a82ab7c0a68f3b4f442ea8ed84c06f317 (patch)
tree26357cce2f08a3682435d2af931e44b2da371d5f /lib/private/templatelayout.php
parentf507601e259da2e6b67237ffcfe8eeda880062ef (diff)
downloadnextcloud-server-716ba49a82ab7c0a68f3b4f442ea8ed84c06f317.tar.gz
nextcloud-server-716ba49a82ab7c0a68f3b4f442ea8ed84c06f317.zip
Log errors and create 404 in network list when a css or js is missing
Diffstat (limited to 'lib/private/templatelayout.php')
-rw-r--r--lib/private/templatelayout.php8
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/private/templatelayout.php b/lib/private/templatelayout.php
index 6f948e38437..3220d9d969c 100644
--- a/lib/private/templatelayout.php
+++ b/lib/private/templatelayout.php
@@ -135,7 +135,9 @@ class OC_TemplateLayout extends OC_Template {
// Read the selected theme from the config file
$theme = OC_Util::getTheme();
- $locator = new \OC\Template\CSSResourceLocator( $theme,
+ $locator = new \OC\Template\CSSResourceLocator(
+ OC::$server->getLogger(),
+ $theme,
array( OC::$SERVERROOT => OC::$WEBROOT ),
array( OC::$THIRDPARTYROOT => OC::$THIRDPARTYWEBROOT ));
$locator->find($styles);
@@ -150,7 +152,9 @@ class OC_TemplateLayout extends OC_Template {
// Read the selected theme from the config file
$theme = OC_Util::getTheme();
- $locator = new \OC\Template\JSResourceLocator( $theme,
+ $locator = new \OC\Template\JSResourceLocator(
+ OC::$server->getLogger(),
+ $theme,
array( OC::$SERVERROOT => OC::$WEBROOT ),
array( OC::$THIRDPARTYROOT => OC::$THIRDPARTYWEBROOT ));
$locator->find($scripts);