diff options
author | Sarven Capadisli <csarven@status.net> | 2010-01-07 09:53:29 +0000 |
---|---|---|
committer | Sarven Capadisli <csarven@status.net> | 2010-01-07 09:53:29 +0000 |
commit | e53512cd2c2180f81fc7317de9df09a140099aa3 (patch) | |
tree | 0ce2990af79feb5c2fb048841d0c61c184dbba00 /actions/apigroupleave.php | |
parent | d17c2d8ebacb799e7dd6bebe249df765ea918880 (diff) | |
parent | f4fa785fb7cf6f222f77ad81f6a1e50e5af7fdf3 (diff) |
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'actions/apigroupleave.php')
-rw-r--r-- | actions/apigroupleave.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/actions/apigroupleave.php b/actions/apigroupleave.php index 514a3a557..5627bfc14 100644 --- a/actions/apigroupleave.php +++ b/actions/apigroupleave.php @@ -108,7 +108,7 @@ class ApiGroupLeaveAction extends ApiAuthAction $member = new Group_member(); $member->group_id = $this->group->id; - $member->profile_id = $this->auth->id; + $member->profile_id = $this->auth_user->id; if (!$member->find(true)) { $this->serverError(_('You are not a member of this group.')); @@ -118,12 +118,12 @@ class ApiGroupLeaveAction extends ApiAuthAction $result = $member->delete(); if (!$result) { - common_log_db_error($member, 'INSERT', __FILE__); + common_log_db_error($member, 'DELETE', __FILE__); $this->serverError( sprintf( - _('Could not remove user %s to group %s.'), + _('Could not remove user %s from group %s.'), $this->user->nickname, - $this->$group->nickname + $this->group->nickname ) ); return; |