Merge branch 'inblob' of git@gitorious.org:~evan/statusnet/evans-mainline into inblob

[quix0rs-gnu-social.git] / actions / leavegroup.php

diff --git a/actions/leavegroup.php b/actions/leavegroup.php
index 60b22e147d735978090f36d0ecc10644ee07b6c2..90c85e1a4e6e602eed57d7b552745564f8c41ae2 100644 (file)
--- a/actions/leavegroup.php
+++ b/actions/leavegroup.php
@@ -56,11 +56,6 @@ class LeavegroupAction extends Action
     {
         parent::prepare($args);
 
-        if (!common_config('inboxes','enabled')) {
-            $this->serverError(_('Inboxes must be enabled for groups to work.'));
-            return false;
-        }
-
         if (!common_logged_in()) {
             $this->clientError(_('You must be logged in to leave a group.'));
             return false;
@@ -128,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));
         }