Merge branch 'nightly' into singpolyma/gnu-social-events-saveObjectFromActivity

[quix0rs-gnu-social.git] / plugins / GNUsocialPhotos / actions / editphoto.php

diff --git a/plugins/GNUsocialPhotos/actions/editphoto.php b/plugins/GNUsocialPhotos/actions/editphoto.php
index 8f719919f970ffdf4255c603d368e740e7f257fa..35dac7bf3f6298d921d62f100ffdd8b7d6059e5b 100644 (file)
--- a/plugins/GNUsocialPhotos/actions/editphoto.php
+++ b/plugins/GNUsocialPhotos/actions/editphoto.php
@@ -192,7 +192,7 @@ class EditphotoAction extends Action
         $this->photo->delete();
         
         if (Event::handle('StartDeleteOwnNotice', array($this->user, $notice))) {
-            $notice->delete();
+            $notice->deleteAs($this->scoped);
             Event::handle('EndDeleteOwnNotice', array($this->user, $notice));
         }
        $this->showForm(_('Success!'));