diff options
Diffstat (limited to 'app/Core')
| -rw-r--r-- | app/Core/Helper.php | 25 | ||||
| -rw-r--r-- | app/Core/Template.php | 25 |
2 files changed, 26 insertions, 24 deletions
diff --git a/app/Core/Helper.php b/app/Core/Helper.php index 3764a67c..e6152127 100644 --- a/app/Core/Helper.php +++ b/app/Core/Helper.php @@ -10,18 +10,19 @@ use Pimple\Container; * @package core * @author Frederic Guillot * - * @property \Kanboard\Helper\AppHelper $app - * @property \Kanboard\Helper\AssetHelper $asset - * @property \Kanboard\Helper\DateHelper $dt - * @property \Kanboard\Helper\FileHelper $file - * @property \Kanboard\Helper\FormHelper $form - * @property \Kanboard\Helper\ModelHelper $model - * @property \Kanboard\Helper\SubtaskHelper $subtask - * @property \Kanboard\Helper\TaskHelper $task - * @property \Kanboard\Helper\TextHelper $text - * @property \Kanboard\Helper\UrlHelper $url - * @property \Kanboard\Helper\UserHelper $user - * @property \Kanboard\Helper\LayoutHelper $layout + * @property \Kanboard\Helper\AppHelper $app + * @property \Kanboard\Helper\AssetHelper $asset + * @property \Kanboard\Helper\DateHelper $dt + * @property \Kanboard\Helper\FileHelper $file + * @property \Kanboard\Helper\FormHelper $form + * @property \Kanboard\Helper\ModelHelper $model + * @property \Kanboard\Helper\SubtaskHelper $subtask + * @property \Kanboard\Helper\TaskHelper $task + * @property \Kanboard\Helper\TextHelper $text + * @property \Kanboard\Helper\UrlHelper $url + * @property \Kanboard\Helper\UserHelper $user + * @property \Kanboard\Helper\LayoutHelper $layout + * @property \Kanboard\Helper\ProjectHeaderHelper $projectHeader */ class Helper { diff --git a/app/Core/Template.php b/app/Core/Template.php index f85c7f28..cf5512d9 100644 --- a/app/Core/Template.php +++ b/app/Core/Template.php @@ -84,25 +84,26 @@ class Template /** * Find template filename * - * Core template name: 'task/show' - * Plugin template name: 'myplugin:task/show' + * Core template: 'task/show' or 'kanboard:task/show' + * Plugin template: 'myplugin:task/show' * * @access public - * @param string $template_name + * @param string $template * @return string */ - public function getTemplateFile($template_name) + public function getTemplateFile($template) { - $template_name = isset($this->overrides[$template_name]) ? $this->overrides[$template_name] : $template_name; + $plugin = ''; + $template = isset($this->overrides[$template]) ? $this->overrides[$template] : $template; - if (strpos($template_name, ':') !== false) { - list($plugin, $template) = explode(':', $template_name); - $path = __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'plugins'; - $path .= DIRECTORY_SEPARATOR.ucfirst($plugin).DIRECTORY_SEPARATOR.'Template'.DIRECTORY_SEPARATOR.$template.'.php'; - } else { - $path = __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'Template'.DIRECTORY_SEPARATOR.$template_name.'.php'; + if (strpos($template, ':') !== false) { + list($plugin, $template) = explode(':', $template); } - return $path; + if ($plugin !== 'kanboard' && $plugin !== '') { + return implode(DIRECTORY_SEPARATOR, array(__DIR__, '..', '..', 'plugins', ucfirst($plugin), 'Template', $template.'.php')); + } + + return implode(DIRECTORY_SEPARATOR, array(__DIR__, '..', 'Template', $template.'.php')); } } |