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

Can now delete lists/peopletags (thanks MrB)

Browse Source 
Reported on https://bugz.foocorp.net/T79
Fix by MrB: https://gist.github.com/mrvdb/0f5d84c9b56c0a390c4a
This commit is contained in:
Mikael Nordfeldth 2015-02-08 23:48:35 +01:00
parent 3a41dc4610
commit 8616055959
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
actions/editpeopletag.php
View File

@ -277,6 +277,14 @@ class EditpeopletagAction extends Action
return; return;
} }
// We tested $delete && !$confirm earlier so confirmation is required before getting here
if ($delete) {
// This might take quite a bit of time.
$this->peopletag->delete();
// send home.
common_redirect(common_local_url('all', array('nickname' => $this->tagger->getNickname())), 303);
}
$this->peopletag->query('BEGIN'); $this->peopletag->query('BEGIN');
$orig = clone($this->peopletag); $orig = clone($this->peopletag);
@ -301,13 +309,6 @@ class EditpeopletagAction extends Action
Profile_tag_subscription::cleanup($this->peopletag); Profile_tag_subscription::cleanup($this->peopletag);
} }
if ($delete) {
// This might take quite a bit of time.
$this->peopletag->delete();
// send home.
common_redirect(common_local_url('all', array('nickname' => $this->tagger->nickname)), 303);
}
if ($tag != $orig->tag) { if ($tag != $orig->tag) {
common_redirect(common_local_url('editpeopletag', common_redirect(common_local_url('editpeopletag',
array('tagger' => $this->tagger->nickname, array('tagger' => $this->tagger->nickname,