diff options
| -rw-r--r-- | actions/deletenotice.php | 50 | ||||
| -rw-r--r-- | actions/replies.php | 2 | ||||
| -rw-r--r-- | classes/Notice.php | 36 | ||||
| -rw-r--r-- | lib/util.php | 21 |
4 files changed, 36 insertions, 73 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); } } diff --git a/classes/Notice.php b/classes/Notice.php index 4a06c9258..c597137fe 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -63,8 +63,24 @@ class Notice extends Memcached_DataObject { $this->blowCaches(true); $this->blowFavesCache(true); - $this->blowInboxes(); - return parent::delete(); + $this->blowSubsCache(true); + + $this->query('BEGIN'); + $related = array('Reply', + 'Fave', + 'Notice_tag', + 'Group_inbox', + 'Queue_item'); + if (common_config('inboxes', 'enabled')) { + $related[] = 'Notice_inbox'; + } + foreach ($related as $cls) { + $inst = new $cls(); + $inst->notice_id = $this->id; + $inst->delete(); + } + $result = parent::delete(); + $this->query('COMMIT'); } function saveTags() @@ -568,22 +584,6 @@ class Notice extends Memcached_DataObject return; } - # Delete from inboxes if we're deleted. - - function blowInboxes() - { - - $enabled = common_config('inboxes', 'enabled'); - - if ($enabled === true || $enabled === 'transitional') { - $inbox = new Notice_inbox(); - $inbox->notice_id = $this->id; - $inbox->delete(); - } - - return; - } - function saveGroups() { $enabled = common_config('inboxes', 'enabled'); diff --git a/lib/util.php b/lib/util.php index 723b2f250..a80c62287 100644 --- a/lib/util.php +++ b/lib/util.php @@ -903,9 +903,9 @@ function common_fancy_url($action, $args=null) case 'grouplogo': return common_path('group/'.$args['nickname'].'/logo'); case 'usergroups': - return common_path($args['nickname'].'/groups'); + return common_path($args['nickname'].'/groups' . (($args) ? ('?' . http_build_query($args)) : '')); case 'groups': - return common_path('group'); + return common_path('group' . (($args) ? ('?' . http_build_query($args)) : '')); default: return common_simple_url($action, $args); } @@ -1140,23 +1140,6 @@ function common_enqueue_notice($notice) return $result; } -function common_dequeue_notice($notice) -{ - $qi = Queue_item::staticGet($notice->id); - if ($qi) { - $result = $qi->delete(); - if (!$result) { - $last_error = &PEAR::getStaticProperty('DB_DataObject','lastError'); - common_log(LOG_ERR, 'DB error deleting queue item: ' . $last_error->message); - return false; - } - common_log(LOG_DEBUG, 'complete dequeueing notice ID = ' . $notice->id); - return $result; - } else { - return false; - } -} - function common_real_broadcast($notice, $remote=false) { $success = true; |