aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJörn Friedrich Dreyer <jfd@butonic.de>2014-01-21 08:31:22 -0800
committerJörn Friedrich Dreyer <jfd@butonic.de>2014-01-21 08:31:22 -0800
commit0dd54a12509445d3fa0b0649b278541f121bead5 (patch)
tree7652bfd83c2ea83c95f30a67f3f5afc6083ad6c2
parent3a17220c9f015435ef15b70de42b4e6d95236888 (diff)
parent221e656e91de48f74e170662cb9680e5e2aac792 (diff)
downloadnextcloud-server-0dd54a12509445d3fa0b0649b278541f121bead5.tar.gz
nextcloud-server-0dd54a12509445d3fa0b0649b278541f121bead5.zip
Merge pull request #6844 from owncloud/fix-css-loading-master
Revert "use getAppWebPath() in here as well"
-rw-r--r--lib/private/template/cssresourcelocator.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/template/cssresourcelocator.php b/lib/private/template/cssresourcelocator.php
index e26daa25827..8e7831ca549 100644
--- a/lib/private/template/cssresourcelocator.php
+++ b/lib/private/template/cssresourcelocator.php
@@ -22,7 +22,7 @@ class CSSResourceLocator extends ResourceLocator {
$app = substr($style, 0, strpos($style, '/'));
$style = substr($style, strpos($style, '/')+1);
$app_path = \OC_App::getAppPath($app);
- $app_url = \OC_App::getAppWebPath($app);
+ $app_url = $this->webroot . '/index.php/apps/' . $app;
if ($this->appendIfExist($app_path, $style.$this->form_factor.'.css', $app_url)
|| $this->appendIfExist($app_path, $style.'.css', $app_url)
) {