Merge branch 'develop'

slimphp · Dec 8, 2013 · 9270489 · 9270489
2 parents d70bda9 + 5b8872f
commit 9270489
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/Smarty.php b/Smarty.php
@@ -79,14 +79,15 @@ class Smarty extends \Slim\View
      * This method will output the rendered template content
      *
      * @param    string $template The path to the template, relative to the  templates directory.
+     * @param null $data
      * @return   void
      */
-    public function render($template)
+    public function render($template, $data = null)
     {
         $parser = $this->getInstance();
         $parser->assign($this->all());
 
-        return $parser->fetch($template);
+        return $parser->fetch($template, $data);
     }
 
     /**

diff --git a/Twig.php b/Twig.php
@@ -78,14 +78,15 @@ class Twig extends \Slim\View
      * This method will output the rendered template content
      *
      * @param   string $template The path to the Twig template, relative to the Twig templates directory.
+     * @param null $data
      * @return  void
      */
-    public function render($template)
+    public function render($template, $data = null)
     {
         $env = $this->getInstance();
         $parser = $env->loadTemplate($template);
 
-        return $parser->render($this->all());
+        return $parser->render($this->all(), $data);
     }
 
     /**