eliseuamaro
/
gnu-social
forked from GNUsocial/gnu-social
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More RESTish URL (/notice/:notice/delete) for notice delete 

Also returns to 'top' now after notice deletion.
This commit is contained in:
Mikael Nordfeldth 2015-07-11 11:26:48 +02:00
parent 7d524307d2
commit ac98600640
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
actions/deletenotice.php
View File

@ -68,16 +68,10 @@ class DeletenoticeAction extends FormAction
$this->notice->delete(); $this->notice->delete();
Event::handle('EndDeleteOwnNotice', array($this->scoped->getUser(), $this->notice)); Event::handle('EndDeleteOwnNotice', array($this->scoped->getUser(), $this->notice));
} }
}
$url = common_get_returnto();
if ($url) {
common_set_returnto(null);
} else { } else {
$url = common_local_url('public'); common_redirect(common_get_returnto(), 303);
} }
common_redirect($url, 303); common_redirect(common_local_url('top'), 303);
} }
} }

4
lib/router.php
View File

@ -244,12 +244,10 @@ class Router
array('action' => 'shownotice'), array('action' => 'shownotice'),
array('notice' => '[0-9]+')); array('notice' => '[0-9]+'));
$m->connect('notice/delete/:notice', $m->connect('notice/:notice/delete',
array('action' => 'deletenotice'), array('action' => 'deletenotice'),
array('notice' => '[0-9]+')); array('notice' => '[0-9]+'));
$m->connect('notice/delete', array('action' => 'deletenotice'));
// conversation // conversation
$m->connect('conversation/:id', $m->connect('conversation/:id',