update from upstream

2015-10-09 14:40:43 +02:00
parent 499d4aadbc 180958185f
commit 5a2d760177
263 changed files with 4987 additions and 6567 deletions
--- a/plugins/Event/actions/cancelrsvp.php
+++ b/plugins/Event/actions/cancelrsvp.php
@@ -138,7 +138,7 @@ class CancelrsvpAction extends Action
            // NB: this will delete the rsvp, too
            if (!empty($notice)) {
                common_log(LOG_DEBUG, "Deleting notice...");
-                $notice->delete();
+                $notice->deleteAs($this->scoped);
            } else {
                common_log(LOG_DEBUG, "Deleting RSVP alone...");
                $this->rsvp->delete();