finished making the "default" view the default view for annotation rather than generi...

git-svn-id: http://code.elgg.org/elgg/trunk@8515 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/views/default/annotation/default.php b/views/default/annotation/default.php
index 869900afae44d1d750cbeefc235c82817425f7ea..acad271f75714dfdc419024250ec7dee024dfda5 100644 (file)
--- 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 04efc6388bd756e9a42755adb026c47d1feef77b..bcf71f0901ee0fffaf326711872ee8194d38c243 100644 (file)
--- 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'),