summaryrefslogtreecommitdiffstats
path: root/lib/template
diff options
context:
space:
mode:
Diffstat (limited to 'lib/template')
-rw-r--r--lib/template/cssresourcelocator.php4
-rw-r--r--lib/template/jsresourcelocator.php6
-rw-r--r--lib/template/templatefilelocator.php1
3 files changed, 6 insertions, 5 deletions
diff --git a/lib/template/cssresourcelocator.php b/lib/template/cssresourcelocator.php
index e27296d9f5f..8e7831ca549 100644
--- a/lib/template/cssresourcelocator.php
+++ b/lib/template/cssresourcelocator.php
@@ -21,10 +21,10 @@ class CSSResourceLocator extends ResourceLocator {
}
$app = substr($style, 0, strpos($style, '/'));
$style = substr($style, strpos($style, '/')+1);
- $app_path = OC_App::getAppPath($app);
+ $app_path = \OC_App::getAppPath($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', $ap_url)
+ || $this->appendIfExist($app_path, $style.'.css', $app_url)
) {
return;
}
diff --git a/lib/template/jsresourcelocator.php b/lib/template/jsresourcelocator.php
index a1382edf2d5..f8fe3817ce6 100644
--- a/lib/template/jsresourcelocator.php
+++ b/lib/template/jsresourcelocator.php
@@ -28,10 +28,10 @@ class JSResourceLocator extends ResourceLocator {
}
$app = substr($script, 0, strpos($script, '/'));
$script = substr($script, strpos($script, '/')+1);
- $app_path = OC_App::getAppPath($app);
- $app_url = OC_App::getAppWebPath($app);
+ $app_path = \OC_App::getAppPath($app);
+ $app_url = \OC_App::getAppWebPath($app);
if ($this->appendIfExist($app_path, $script.$this->form_factor.'.js', $app_url)
- || $this->appendIfExist($app_path, $script.'.js', $ap_url)
+ || $this->appendIfExist($app_path, $script.'.js', $app_url)
) {
return;
}
diff --git a/lib/template/templatefilelocator.php b/lib/template/templatefilelocator.php
index eeb27c139a7..cc5e88771ff 100644
--- a/lib/template/templatefilelocator.php
+++ b/lib/template/templatefilelocator.php
@@ -11,6 +11,7 @@ namespace OC\Template;
class TemplateFileLocator {
protected $form_factor;
protected $dirs;
+ private $path;
public function __construct( $form_factor, $dirs ) {
$this->form_factor = $form_factor;