2 files changed, 7 insertions, 11 deletions
diff --git a/modules/user/helpers/group.php b/modules/user/helpers/group.php
index ffd344f8..a45f6337 100644
--- a/modules/user/helpers/group.php
+++ b/modules/user/helpers/group.php
@@ -63,7 +63,7 @@ class group_Core {
 
   public static function get_edit_form_admin($group) {
     $form = new Forge("admin/groups/edit/$group->id");
-    $form_group = $form->group("edit_group")->label(_("Edit Group"));
+    $form_group = $form->group("edit_group");
     $form_group->input("name")->label(_("Name"))->id("gName")->value($group->name);
     $form->add_rules_from($group);
     return $form;
@@ -71,7 +71,7 @@ class group_Core {
 
   public static function get_add_form_admin() {
     $form = new Forge("admin/groups/add");
-    $form_group = $form->group("add_group")->label(_("Add Group"));
+    $form_group = $form->group("add_group");
     $form_group->input("name")->label(_("Name"))->id("gName");
     $group = ORM::factory("group");
     $form->add_rules_from($group);
@@ -79,8 +79,6 @@ class group_Core {
   }
 
   public static function get_delete_form_admin($group) {
-    $form = new Forge("admin/groups/delete/$group->id",
-                      sprintf(_("Are you sure you want to delete %s"), $group->name));
-    print $form;
+    return new Forge("admin/groups/delete/$group->id");
   }
 }
diff --git a/modules/user/helpers/user.php b/modules/user/helpers/user.php
index 1da0b8cd..6d933d90 100644
--- a/modules/user/helpers/user.php
+++ b/modules/user/helpers/user.php
@@ -26,7 +26,7 @@
 class user_Core {
   public static function get_edit_form($user, $action = NULL) {
     $form = new Forge("users/$user->id?_method=put", "", "post", array("id" => "gUserForm"));
-    $group = $form->group("edit_user")->label(_("Edit User"));
+    $group = $form->group("edit_user");
     $group->input("name")->label(_("Name"))->id("gName")->value($user->name);
     $group->input("full_name")->label(_("Full Name"))->id("gFullName")->value($user->full_name);
     $group->password("password")->label(_("Password"))->id("gPassword");
@@ -38,7 +38,7 @@ class user_Core {
 
   public static function get_edit_form_admin($user) {
     $form = new Forge("admin/users/edit/$user->id");
-    $group = $form->group("edit_user")->label(_("Edit User"));
+    $group = $form->group("edit_user");
     $group->input("name")->label(_("Name"))->id("gName")->value($user->name);
     $group->input("full_name")->label(_("Full Name"))->id("gFullName")->value($user->full_name);
     $group->password("password")->label(_("Password"))->id("gPassword");
@@ -49,7 +49,7 @@ class user_Core {
 
   public static function get_add_form_admin() {
     $form = new Forge("admin/users/add");
-    $group = $form->group("add_user")->label(_("Add User"));
+    $group = $form->group("add_user");
     $group->input("name")->label(_("Name"))->id("gName");
     $group->input("full_name")->label(_("Full Name"))->id("gFullName");
     $group->password("password")->label(_("Password"))->id("gPassword");
@@ -61,9 +61,7 @@ class user_Core {
   }
 
   public static function get_delete_form_admin($user) {
-    $form = new Forge("admin/users/delete/$user->id",
-                      sprintf(_("Are you sure you want to delete %s"), $user->name));
-    print $form;
+    return new Forge("admin/users/delete/$user->id");
   }
 
   /**