3 files changed, 16 insertions, 9 deletions

diff --git a/core/controllers/welcome.php b/core/controllers/welcome.php
index ce9d3219..2839b2f1 100644
--- a/core/controllers/welcome.php
+++ b/core/controllers/welcome.php
@@ -456,12 +456,13 @@ class Welcome_Controller extends Template_Controller {
   }
 
   public function delete_group($id) {
-    group::delete($id);
+    ORM::factory("group", $id)->delete();
     url::redirect("welcome");
   }
 
   public function remove_from_group($group_id, $user_id) {
-    group::remove_user($group_id, $user_id);
+    ORM::factory("group", $group_id)->remove(
+      ORM::factory("user", $user_id));
     url::redirect("welcome");
   }
 
@@ -469,7 +470,7 @@ class Welcome_Controller extends Template_Controller {
     $group_name = $this->input->post("group_name");
     $group = ORM::factory("group")->where("name", $group_name)->find();
     if ($group->loaded) {
-      group::add_user($group->id, $user_id);
+      $group->add(ORM::factory("user", $user_id));
     }
     url::redirect("welcome");
   }
diff --git a/core/helpers/access.php b/core/helpers/access.php
index 8f2453df..f4e98082 100644
--- a/core/helpers/access.php
+++ b/core/helpers/access.php
@@ -200,7 +200,10 @@ class access_Core {
       self::_drop_columns($name, $group->id);
     }
     self::_drop_columns($name, 0);
-    ORM::factory("permission")->where("name", $name)->find()->delete();
+    $permission = ORM::factory("permission")->where("name", $name)->find();
+    if ($permission->loaded) {
+      $permission->delete();
+    }
   }
 
   /**
diff --git a/core/tests/Access_Helper_Test.php b/core/tests/Access_Helper_Test.php
index 96a28ada..41f2770e 100644
--- a/core/tests/Access_Helper_Test.php
+++ b/core/tests/Access_Helper_Test.php
@@ -24,7 +24,7 @@ class Access_Helper_Test extends Unit_Test_Case {
     try {
       $group = ORM::factory("group")->where("name", "access_test")->find();
       if ($group->loaded) {
-        group::delete($group->id);
+        $group->delete();
       }
     } catch (Exception $e) { }
 
@@ -33,7 +33,10 @@ class Access_Helper_Test extends Unit_Test_Case {
     } catch (Exception $e) { }
 
     try {
-      ORM::factory("user")->where("name", "access_test")->find()->delete();
+      $user = ORM::factory("user")->where("name", "access_test")->find();
+      if ($user->loaded) {
+        $user->delete();
+      }
     } catch (Exception $e) { }
   }
 
@@ -46,7 +49,7 @@ class Access_Helper_Test extends Unit_Test_Case {
     $this->assert_true(array_key_exists("access_test_{$group->id}", $fields));
 
     access::delete_permission("access_test");
-    group::delete($group->id);
+    $group->delete();
 
     // Now the column has gone away
     $fields = Database::instance()->list_fields("access_caches");
@@ -230,7 +233,7 @@ class Access_Helper_Test extends Unit_Test_Case {
     // Create a new user that belongs to no groups
     $user = user::create("access_test", "Access Test", "");
     foreach ($user->groups as $group) {
-      group::remove_user($group->id, $user->id);
+      $user->remove($group);
     }
     Session::instance()->set("user", $user);
 
@@ -239,7 +242,7 @@ class Access_Helper_Test extends Unit_Test_Case {
 
     // Now add them to a group that has edit permission
     $group = group::create("access_test");
-    group::add_user($group->id, $user->id);
+    $group->add($user);
     access::allow($group->id, "edit", 1);
     Session::instance()->set("user", $user->reload());