6 files changed, 10 insertions, 10 deletions
diff --git a/core/controllers/album.php b/core/controllers/album.php
index 87e27ac5..1701e283 100644
--- a/core/controllers/album.php
+++ b/core/controllers/album.php
@@ -47,6 +47,6 @@ class Album_Controller extends Item_Controller {
     $template->set_global('user', Session::instance()->get('user', null));
     $template->content = new View("album.html");
 
-    print $template->render();
+    print $template;
   }
 }
diff --git a/core/controllers/photo.php b/core/controllers/photo.php
index 4c3154bd..2a0153a2 100644
--- a/core/controllers/photo.php
+++ b/core/controllers/photo.php
@@ -42,6 +42,6 @@ class Photo_Controller extends Item_Controller {
     $template->set_global('user', Session::instance()->get('user', null));
     $template->content = new View("photo.html");
 
-    print $template->render();
+    print $template;
   }
 }
diff --git a/core/controllers/rest.php b/core/controllers/rest.php
index 4a6c4eb4..aee4f527 100644
--- a/core/controllers/rest.php
+++ b/core/controllers/rest.php
@@ -72,7 +72,7 @@ abstract class REST_Controller extends Controller {
 
       if (Session::instance()->get("use_profiler", false)) {
         $profiler = new Profiler();
-        print $profiler->render();
+        $profiler->render();
       }
       return;
     }
diff --git a/modules/comment/controllers/comment.php b/modules/comment/controllers/comment.php
index a8f52443..4c04e007 100644
--- a/modules/comment/controllers/comment.php
+++ b/modules/comment/controllers/comment.php
@@ -26,7 +26,7 @@ class Comment_Controller extends REST_Controller {
    */
   public function _form($comment) {
     $form = comment::get_edit_form($comment);
-    print $form->render("form.html");
+    print $form;
   }
 
   /**
@@ -58,7 +58,7 @@ class Comment_Controller extends REST_Controller {
       $comment->save();
       return;
     }
-    print $form->render();
+    print $form;
   }
 
   /**
diff --git a/modules/comment/controllers/comments.php b/modules/comment/controllers/comments.php
index a0233a0b..60ab9b5d 100644
--- a/modules/comment/controllers/comments.php
+++ b/modules/comment/controllers/comments.php
@@ -26,7 +26,7 @@ class Comments_Controller extends REST_Controller {
    */
   public function _form($item) {
     $form = comment::get_add_form($item);
-    print $form->render("form.html");
+    print $form;
   }
 
   /**
@@ -63,7 +63,7 @@ class Comments_Controller extends REST_Controller {
       header("HTTP/1.1 201 Created");
       header("Location: " . url::site("comment/{$comment->id}"));
     }
-    print $form->render("form.html");
+    print $form;
   }
 
   /**
diff --git a/modules/user/controllers/user.php b/modules/user/controllers/user.php
index c1794af3..c25c9c35 100644
--- a/modules/user/controllers/user.php
+++ b/modules/user/controllers/user.php
@@ -26,7 +26,7 @@ class User_Controller extends REST_Controller {
    */
   public function _form($user) {
     $form = user::get_edit_form($user);
-    print $form->render();
+    print $form;
   }
 
   /**
@@ -40,7 +40,6 @@ class User_Controller extends REST_Controller {
    *  @see Rest_Controller::_put($resource)
    */
   public function _put($resource) {
-    throw new Exception("@todo User_Controller::_put NOT IMPLEMENTED");
   }
 
   /**
@@ -58,7 +57,8 @@ class User_Controller extends REST_Controller {
       }
       return;
     }
-    print $form->render("form.html");
+    print $form;
+   throw new Exception("@todo User_Controller::_put NOT IMPLEMENTED");
   }
 
   /**