explicitely pass template environment

diff --git a/ipf/shortcuts.php b/ipf/shortcuts.php
index 986e8f20d4b55a56fe9ff65b60de930f1e5cdd20..8e1c147764a05ecf7edb9c238021d1f1380f15d2 100644 (file)
--- a/ipf/shortcuts.php
+++ b/ipf/shortcuts.php
@@ -29,7 +29,9 @@ final class IPF_Shortcuts
         }
         $context = new IPF_Template_Context($params);
 
-        $tmpl = new IPF_Template_File($tplfile);
+        $environment = IPF_Template_Environment::getDefault();
+
+        $tmpl = new IPF_Template_File($tplfile, $environment);
         return $tmpl->render($context);
     }
 

diff --git a/ipf/template.php b/ipf/template.php
index 18c03ef989d322e0aa44c7231f3d0a322993a616..fd9b27b8a1de537c4ae1154297d15762e082e936 100644 (file)
--- a/ipf/template.php
+++ b/ipf/template.php
@@ -4,7 +4,7 @@ abstract class IPF_Template
 {
     protected $environment;
 
-    public function __construct($environment)
+    public function __construct(IPF_Template_Environment $environment)
     {
         $this->environment = $environment;
     }

diff --git a/ipf/template/file.php b/ipf/template/file.php
index 50e01442dc04e196520ee05ceb4b89c68ed39926..2c813eb470573d2ab1f567f935994dc6c5462eaa 100644 (file)
--- a/ipf/template/file.php
+++ b/ipf/template/file.php
@@ -4,9 +4,9 @@ class IPF_Template_File extends IPF_Template
 {
     private $tpl;
 
-    function __construct($template, $environment=null)
+    function __construct($template, IPF_Template_Environment $environment)
     {
-        parent::__construct($environment ? $environment : IPF_Template_Environment::getDefault());
+        parent::__construct($environment);
         $this->tpl = $template;
     }
 

diff --git a/ipf/template/string.php b/ipf/template/string.php
index 09a6f5f373bc3247663d3cf5dab1b6b8fcd8ee19..835e55a98a82fc96cb112444d7784d7fb72b94d8 100644 (file)
--- a/ipf/template/string.php
+++ b/ipf/template/string.php
@@ -4,9 +4,9 @@ class IPF_Template_String extends IPF_Template
 {
     private $tpl;
 
-    function __construct($template, $environment=null)
+    function __construct($template, IPF_Template_Environment $environment)
     {
-        parent::__construct($environment ? $environment : IPF_Template_Environment::getDefault());
+        parent::__construct($environment);
         $this->tpl = $template;
     }