diff options
| author | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-03-01 01:28:50 +0000 |
|---|---|---|
| committer | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-03-01 01:28:50 +0000 |
| commit | f8c113e05d030e727d6feab47f0d5959404e225f (patch) | |
| tree | 17dc2cb7e1978e5a5fb5a4e1feadc98ecd6c9894 | |
| parent | fc07ecc5677df5989d89d9e04e5bb088a9bce177 (diff) | |
| download | elgg-f8c113e05d030e727d6feab47f0d5959404e225f.tar.gz elgg-f8c113e05d030e727d6feab47f0d5959404e225f.tar.bz2 | |
finished making the "default" view the default view for annotation rather than generic_comment
git-svn-id: http://code.elgg.org/elgg/trunk@8515 36083f99-b078-4883-b0ff-0f9b5a30f544
| -rw-r--r-- | views/default/annotation/default.php | 2 | ||||
| -rw-r--r-- | views/default/annotation/generic_comment.php | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/views/default/annotation/default.php b/views/default/annotation/default.php index 869900afa..acad271f7 100644 --- a/views/default/annotation/default.php +++ b/views/default/annotation/default.php @@ -3,6 +3,8 @@ * Elgg default annotation view * * @uses $vars['annotation'] + * @uses $vars['delete_action'] A custom action for the delete button. + * The annotation ID is passed as 'annotation_id'. */ $annotation = $vars['annotation']; diff --git a/views/default/annotation/generic_comment.php b/views/default/annotation/generic_comment.php index 04efc6388..bcf71f090 100644 --- a/views/default/annotation/generic_comment.php +++ b/views/default/annotation/generic_comment.php @@ -4,9 +4,6 @@ * * @uses $vars['annotation'] ElggAnnotation object * @uses $vars['full'] Display fill view or brief view - * @uses $vars['delete_action'] A custom action for the delete button. Defaults to - * action/comments/delete The annotation ID is passed - * as 'annotation_id'. */ if (!isset($vars['annotation'])) { @@ -14,7 +11,6 @@ if (!isset($vars['annotation'])) { } $full_view = elgg_extract('full', $vars, true); -$delete_action = elgg_extract('delete_action', $vars, 'action/comments/delete'); $comment = $vars['annotation']; @@ -36,7 +32,7 @@ if ($full_view) { $delete_button = ''; if ($comment->canEdit()) { - $url = elgg_http_add_url_query_elements($delete_action, array('annotation_id' => $comment->id)); + $url = "action/comments/delete?annotation_id=$comment->id"; $delete_button = elgg_view("output/confirmlink", array( 'href' => $url, 'text' => elgg_echo('delete'), |