diff options
Diffstat (limited to 'actions')
| -rw-r--r-- | actions/deletenotice.php | 50 | ||||
| -rw-r--r-- | actions/replies.php | 2 |
2 files changed, 16 insertions, 36 deletions
diff --git a/actions/deletenotice.php b/actions/deletenotice.php index efef95441..d4b8e50e5 100644 --- a/actions/deletenotice.php +++ b/actions/deletenotice.php @@ -71,7 +71,7 @@ class DeletenoticeAction extends DeleteAction function getInstructions() { return _('You are about to permanently delete a notice. ' . - 'Once this is done, it cannot be undone.'); + 'Once this is done, it cannot be undone.'); } function title() @@ -104,22 +104,15 @@ class DeletenoticeAction extends DeleteAction function showContent() { $this->elementStart('form', array('id' => 'notice_delete_form', - 'method' => 'post', - 'action' => common_local_url('deletenotice'))); + 'method' => 'post', + 'action' => common_local_url('deletenotice'))); $this->hidden('token', common_session_token()); $this->hidden('notice', $this->trimmed('notice')); $this->elementStart('p'); $this->element('span', array('id' => 'confirmation_text'), - _('Are you sure you want to delete this notice?')); - - $this->element('input', array('id' => 'submit_no', - 'name' => 'submit', - 'type' => 'submit', - 'value' => _('No'))); - $this->element('input', array('id' => 'submit_yes', - 'name' => 'submit', - 'type' => 'submit', - 'value' => _('Yes'))); + _('Are you sure you want to delete this notice?')); + $this->submit('yes', _('Yes')); + $this->submit('no', _('No')); $this->elementEnd('p'); $this->elementEnd('form'); } @@ -131,35 +124,22 @@ class DeletenoticeAction extends DeleteAction if (!$token || $token != common_session_token()) { $this->showForm(_('There was a problem with your session token. ' . - ' Try again, please.')); + ' Try again, please.')); return; } - $url = common_get_returnto(); - $confirmed = $this->trimmed('submit'); - - if ($confirmed == _('Yes')) { - - $replies = new Reply; - $replies->get('notice_id', $this->notice->id); - - common_dequeue_notice($this->notice); - - if (common_config('memcached', 'enabled')) { - $notice->blowSubsCache(); - } - - $replies->delete(); + if ($this->arg('yes')) { $this->notice->delete(); + } - } else { + $url = common_get_returnto(); - if ($url) { - common_set_returnto(null); - } else { - $url = common_local_url('public'); - } + if ($url) { + common_set_returnto(null); + } else { + $url = common_local_url('public'); } + common_redirect($url); } } diff --git a/actions/replies.php b/actions/replies.php index 5777d17fd..9ec373a96 100644 --- a/actions/replies.php +++ b/actions/replies.php @@ -116,7 +116,7 @@ class RepliesAction extends Action return sprintf(_("Replies to %s"), $this->user->nickname); } else { return sprintf(_("Replies to %s, page %d"), - $profile->nickname, + $this->user->nickname, $this->page); } } |