From 4fe7d5e28d0095be2c3260ced5e9ec18f001cfef Mon Sep 17 00:00:00 2001 From: Andrey Kutejko Date: Sun, 4 Jan 2015 12:37:02 +0200 Subject: [PATCH] make project context independent of template engine --- ipf/admin/controllers/base.php | 2 +- ipf/project_template.php | 2 +- ipf/shortcuts.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ipf/admin/controllers/base.php b/ipf/admin/controllers/base.php index 8654821..7c4c9d5 100644 --- a/ipf/admin/controllers/base.php +++ b/ipf/admin/controllers/base.php @@ -15,7 +15,7 @@ abstract class IPF_Admin_Base_Controller extends IPF_Controller { $context = IPF_Project_Template::context($params, $this->request); $tmpl = new IPF_Template_File($template, IPF_Project_Template::getDefaultTemplateEnvironment()); - $html = $tmpl->render($context); + $html = $tmpl->render(new IPF_Template_Context($context)); return new IPF_HTTP_Response($html); } } diff --git a/ipf/project_template.php b/ipf/project_template.php index 5428001..ced4a7c 100644 --- a/ipf/project_template.php +++ b/ipf/project_template.php @@ -61,7 +61,7 @@ final class IPF_Project_Template $params = array_merge($app->templateContext($request), $params); } } - return new IPF_Template_Context($params); + return $params; } } diff --git a/ipf/shortcuts.php b/ipf/shortcuts.php index 6c1093c..8b90bfc 100644 --- a/ipf/shortcuts.php +++ b/ipf/shortcuts.php @@ -11,7 +11,7 @@ final class IPF_Shortcuts { $context = IPF_Project_Template::context($params, $request); $tmpl = new IPF_Template_File($tplfile, IPF_Project_Template::getDefaultTemplateEnvironment()); - return $tmpl->render($context); + return $tmpl->render(new IPF_Template_Context($context)); } } -- 2.49.0