replace 'public' in documentation with 'top'

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

diff --git a/actions/leavegroup.php b/actions/leavegroup.php
index f5d1ccd08ca456e814d108b93958674e2f20eeec..b8aaf83d20d737ec54faad176680873ef893f44d 100644 (file)
--- a/actions/leavegroup.php
+++ b/actions/leavegroup.php
@@ -123,11 +123,9 @@ class LeavegroupAction extends Action
         $cur = common_current_user();
 
         try {
-            if (Event::handle('StartLeaveGroup', array($this->group, $cur))) {
-                Group_member::leave($this->group->id, $cur->id);
-                Event::handle('EndLeaveGroup', array($this->group, $cur));
-            }
+            $cur->leaveGroup($this->group);
         } catch (Exception $e) {
+            common_log(LOG_ERR, "Error when {$cur->nickname} tried to leave {$this->group->nickname}: " . $e->getMessage());
             // TRANS: Server error displayed when leaving a group failed in the database.
             // TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
             $this->serverError(sprintf(_('Could not remove user %1$s from group %2$s.'),