remove redundand class

diff --git a/ipf/shortcuts.php b/ipf/shortcuts.php
index 04bd11a5a5eb651ba130ff69d30389a3ae1b4070..986e8f20d4b55a56fe9ff65b60de930f1e5cdd20 100644 (file)
--- a/ipf/shortcuts.php
+++ b/ipf/shortcuts.php
@@ -17,12 +17,19 @@ final class IPF_Shortcuts
 
     public static function RenderToString($tplfile, $params=array(), $request=null)
     {
-        $tmpl = new IPF_Template_File($tplfile);
-        if (is_null($request)) {
-            $context = new IPF_Template_Context($params);
-        } else {
-            $context = new IPF_Template_Context_Request($request, $params);
+        if ($request) {
+            $params = array_merge(array('request' => $request), $params);
+            foreach (IPF::get('template_context_processors', array()) as $proc) {
+                IPF::loadFunction($proc);
+                $params = array_merge($proc($request), $params);
+            }
+            foreach (IPF_Project::getInstance()->appList() as $app) {
+                $params = array_merge($app->templateContext($request), $params);
+            }
         }
+        $context = new IPF_Template_Context($params);
+
+        $tmpl = new IPF_Template_File($tplfile);
         return $tmpl->render($context);
     }
 

diff --git a/ipf/template/context/request.php b/ipf/template/context/request.php
deleted file mode 100644 (file)
index 1d4684d..0000000
--- a/ipf/template/context/request.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-class IPF_Template_Context_Request extends IPF_Template_Context
-{
-    function __construct($request, $vars=array())
-    {
-        $vars = array_merge(array('request' => $request), $vars);
-        foreach (IPF::get('template_context_processors', array()) as $proc) {
-            IPF::loadFunction($proc);
-            $vars = array_merge($proc($request), $vars);
-        }
-        foreach (IPF_Project::getInstance()->appList() as $app) {
-            $vars = array_merge($app->templateContext($request), $vars);
-        }
-        parent::__construct($vars);
-    }
-}
-