summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrederic Guillot <fred@kanboard.net>2016-04-24 14:46:18 -0400
committerFrederic Guillot <fred@kanboard.net>2016-04-24 14:46:18 -0400
commit2cd06f8795e1d4e3c9c267e399e2925be8a9e5a7 (patch)
treee8e04db7436041b30db6fd7e85e333ba54d1047c
parentda1725c225c94bcdffe4dba4c068db8e1e11cbe7 (diff)
Use PLUGINS_DIR constant to load plugin templates
-rw-r--r--app/Core/Plugin/Loader.php2
-rw-r--r--app/Core/Template.php2
-rw-r--r--tests/units/Core/TemplateTest.php4
3 files changed, 4 insertions, 4 deletions
diff --git a/app/Core/Plugin/Loader.php b/app/Core/Plugin/Loader.php
index 0b009f75..799024ad 100644
--- a/app/Core/Plugin/Loader.php
+++ b/app/Core/Plugin/Loader.php
@@ -73,7 +73,7 @@ class Loader extends \Kanboard\Core\Base
$instance = new $class($this->container);
- Tool::buildDic($this->container, $instance->getClasses());
+ Tool::buildDIC($this->container, $instance->getClasses());
Tool::buildDICHelpers($this->container, $instance->getHelpers());
$instance->initialize();
diff --git a/app/Core/Template.php b/app/Core/Template.php
index 1874d44a..d3ec26d5 100644
--- a/app/Core/Template.php
+++ b/app/Core/Template.php
@@ -116,7 +116,7 @@ class Template
}
if ($plugin !== 'kanboard' && $plugin !== '') {
- return implode(DIRECTORY_SEPARATOR, array(__DIR__, '..', '..', 'plugins', ucfirst($plugin), 'Template', $template.'.php'));
+ return implode(DIRECTORY_SEPARATOR, array(PLUGINS_DIR, ucfirst($plugin), 'Template', $template.'.php'));
}
return implode(DIRECTORY_SEPARATOR, array(__DIR__, '..', 'Template', $template.'.php'));
diff --git a/tests/units/Core/TemplateTest.php b/tests/units/Core/TemplateTest.php
index 9584c831..453f0b14 100644
--- a/tests/units/Core/TemplateTest.php
+++ b/tests/units/Core/TemplateTest.php
@@ -25,7 +25,7 @@ class TemplateTest extends Base
{
$template = new Template($this->container['helper']);
$this->assertStringEndsWith(
- implode(DIRECTORY_SEPARATOR, array('app', 'Core', '..', '..', 'plugins', 'Myplugin', 'Template', 'a', 'b.php')),
+ implode(DIRECTORY_SEPARATOR, array(PLUGINS_DIR, 'Myplugin', 'Template', 'a', 'b.php')),
$template->getTemplateFile('myplugin:a'.DIRECTORY_SEPARATOR.'b')
);
}
@@ -36,7 +36,7 @@ class TemplateTest extends Base
$template->setTemplateOverride('a'.DIRECTORY_SEPARATOR.'b', 'myplugin:c');
$this->assertStringEndsWith(
- implode(DIRECTORY_SEPARATOR, array('app', 'Core', '..', '..', 'plugins', 'Myplugin', 'Template', 'c.php')),
+ implode(DIRECTORY_SEPARATOR, array(PLUGINS_DIR, 'Myplugin', 'Template', 'c.php')),
$template->getTemplateFile('a'.DIRECTORY_SEPARATOR.'b')
);