GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Delete the notice *and* the photo

Browse Source
This commit is contained in:
Max Shinn 2010-12-29 13:03:23 -06:00
parent 35e0832ec0
commit 57aef10ed2
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
plugins/GNUsocialPhotos/actions/editphoto.php
View File

@ -182,18 +182,13 @@ class EditphotoAction extends Action
//For redirection //For redirection
$oldalbum = $this->album_id; $oldalbum = $this->album_id;
$this->photo->title = ""; $notice = Notice::staticGet('id', $this->photo->notice_id);
$this->photo->photo_description = "";
$this->photo->profile_id = 0;
$this->photo->album_id = 0;
$this->photo->uri = "";
$this->photo->thumb_uri = "";
if ($this->photo->validate()) $this->photo->delete();
$this->photo->update();
else { if (Event::handle('StartDeleteOwnNotice', array($this->user, $notice))) {
$this->showForm(_('Error: The photo data is not valid.')); $notice->delete();
return; Event::handle('EndDeleteOwnNotice', array($this->user, $notice));
} }
$this->showForm(_('Success!')); $this->showForm(_('Success!'));
common_redirect('/' . $this->user->nickname . '/photos/' . $oldalbum, '303'); common_redirect('/' . $this->user->nickname . '/photos/' . $oldalbum, '303');