From: Zach Copley <zach@status.net>
Date: Thu, 7 Jan 2010 00:24:25 +0000 (-0800)
Subject: Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=5d13126c88a8143a1628cc52c2dae4581f134273;hp=5d9a2eb17e3f6e3bc73b5aa80625a365761b6689;p=quix0rs-gnu-social.git

Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
---

diff --git a/actions/apigroupleave.php b/actions/apigroupleave.php
index 514a3a557d..5627bfc146 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;
diff --git a/actions/leavegroup.php b/actions/leavegroup.php
index 08fce15098..90c85e1a4e 100644
--- a/actions/leavegroup.php
+++ b/actions/leavegroup.php
@@ -123,8 +123,8 @@ class LeavegroupAction extends Action
         $result = $member->delete();
 
         if (!$result) {
-            common_log_db_error($member, 'INSERT', __FILE__);
-            $this->serverError(sprintf(_('Could not remove user %s to group %s'),
+            common_log_db_error($member, 'DELETE', __FILE__);
+            $this->serverError(sprintf(_('Could not remove user %s from group %s'),
                                        $cur->nickname, $this->group->nickname));
         }