summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2009-01-21 08:14:18 +0000
committerBharat Mediratta <bharat@menalto.com>2009-01-21 08:14:18 +0000
commita0456a9a47d35aa8a3776d6b5fea0e68706855d8 (patch)
tree2712c68c1fc499dbffbf8582b1c47dedcc627f89
parent6d99c29172a6b8a5e3ceb9df27b5fcb56337a0b2 (diff)
Fix bug in add_to_group / remove_from_group where we were looking up users using Group_Model.
-rw-r--r--core/controllers/welcome.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/controllers/welcome.php b/core/controllers/welcome.php
index 6130f0ed..c9d124a4 100644
--- a/core/controllers/welcome.php
+++ b/core/controllers/welcome.php
@@ -582,7 +582,7 @@ class Welcome_Controller extends Template_Controller {
public function remove_from_group($group_id, $user_id) {
$group = ORM::factory("group", $group_id);
- $user = ORM::factory("group", $user_id);
+ $user = ORM::factory("user", $user_id);
if ($group->loaded && $user->loaded) {
$group->remove($user);
$group->save();
@@ -593,7 +593,7 @@ class Welcome_Controller extends Template_Controller {
public function add_to_group($user_id) {
$group_name = $this->input->post("group_name");
$group = ORM::factory("group")->where("name", $group_name)->find();
- $user = ORM::factory("group", $user_id);
+ $user = ORM::factory("user", $user_id);
if ($group->loaded && $user->loaded) {
$group->add($user);
$group->save();