From 57aef10ed27f9031c74c8f2c6bf37c8e3e9a4081 Mon Sep 17 00:00:00 2001
From: Max Shinn <trombonechamp@gmail.com>
Date: Wed, 29 Dec 2010 13:03:23 -0600
Subject: [PATCH] Delete the notice *and* the photo

---
 plugins/GNUsocialPhotos/actions/editphoto.php | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/plugins/GNUsocialPhotos/actions/editphoto.php b/plugins/GNUsocialPhotos/actions/editphoto.php
index eacd09156d..e32b5fe01d 100644
--- a/plugins/GNUsocialPhotos/actions/editphoto.php
+++ b/plugins/GNUsocialPhotos/actions/editphoto.php
@@ -182,20 +182,15 @@ class EditphotoAction extends Action
         //For redirection
         $oldalbum = $this->album_id;
 
-        $this->photo->title = "";
-        $this->photo->photo_description = "";
-        $this->photo->profile_id = 0;
-        $this->photo->album_id = 0;
-        $this->photo->uri = "";
-        $this->photo->thumb_uri = "";
+        $notice = Notice::staticGet('id', $this->photo->notice_id);
 
-        if ($this->photo->validate())
-            $this->photo->update();
-        else {
-            $this->showForm(_('Error: The photo data is not valid.'));
-            return;
+        $this->photo->delete();
+        
+        if (Event::handle('StartDeleteOwnNotice', array($this->user, $notice))) {
+            $notice->delete();
+            Event::handle('EndDeleteOwnNotice', array($this->user, $notice));
         }
-        $this->showForm(_('Success!'));
+       $this->showForm(_('Success!'));
         common_redirect('/' . $this->user->nickname . '/photos/' . $oldalbum, '303');
         return;
     }