make project context independent of template engine

diff --git a/ipf/admin/controllers/base.php b/ipf/admin/controllers/base.php
index 8654821728880cbbca390d1ceb55b94f5b186569..7c4c9d5fcbcfd7eadf8f7e83e0588f8c5805b449 100644 (file)
--- 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 5428001fc69f4eec83394b40df1fefe5a19dccdb..ced4a7ca255a60fefc407c10298132bb5b54e52a 100644 (file)
--- 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 6c1093c90c12b1eb2fbd3de8d43df9d87c255a99..8b90bfcf6016a972b6facc093be49f9f7ec56d52 100644 (file)
--- 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));
     }
 }