Index: openacs-4/packages/lars-blogger/www/entry-chunk.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/entry-chunk.adp,v
diff -u -r1.31 -r1.32
--- openacs-4/packages/lars-blogger/www/entry-chunk.adp	16 Oct 2006 15:21:54 -0000	1.31
+++ openacs-4/packages/lars-blogger/www/entry-chunk.adp	11 Mar 2007 17:20:49 -0000	1.32
@@ -70,8 +70,8 @@
   <multiple name="comments">
     <a name="comment@comments.comment_id@"></a>
     <h3 class="lars_blogger_comment_title">@comments.title@</h3>
-    <p class="lars_blogger_comment_text">@comments.content;noquote@</p>
-    <p><if @comments.trackback_p@ eq "f">#lars-blogger.by_commentsauthor#</if><else>#lars-blogger.Trackback_from# <a href="@comments.trackback_url@" title="@comments.trackback_name@">@comments.trackback_name@</a></else> #lars-blogger.lt_on_commentspretty_dat#</p>
+    <p class="lars_blogger_comment_text">@comments.content;noquote@</p> 
+    <p><if @comments.trackback_p@ eq "f">#lars-blogger.by_commentsauthor#</if><else>#lars-blogger.Trackback_from# <a href="@comments.trackback_url@" title="@comments.trackback_name@">@comments.trackback_name@</a></else> #lars-blogger.lt_on_commentspretty_dat#<if @admin_p@ eq 1> | <a href="@general_comments_package_url@comment-edit?comment_id=@comments.comment_id@&return_url=@comment_return_url@">Edit</a> | <a href="@general_comments_package_url@admin/delete?comment_id=@comments.comment_id@&return_url=@comment_return_url@">Delete</a></if></p>
   </multiple>
   <center><a href="@blog.comment_add_url@" title="Comment on this entry">#lars-blogger.Add_comment#</a></center>
 </if>
Index: openacs-4/packages/lars-blogger/www/entry-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/entry-chunk.tcl,v
diff -u -r1.22 -r1.23
--- openacs-4/packages/lars-blogger/www/entry-chunk.tcl	8 Aug 2006 21:26:57 -0000	1.22
+++ openacs-4/packages/lars-blogger/www/entry-chunk.tcl	11 Mar 2007 17:20:49 -0000	1.23
@@ -50,13 +50,12 @@
 set show_poster_p [ad_parameter "ShowPosterP" "" "1"]
 
 set entry_id $blog(entry_id)
-
+set admin_p [permission::permission_p -object_id $entry_id -party_id $user_id -privilege admin]
 lars_blogger::entry::htmlify \
     -max_content_length $max_content_length \
     -more [ad_decode [ad_return_url] $blog(permalink_url) {} " <a href=\"[ad_quotehtml $blog(permalink_url)]\">Continued...</a>"] \
     -array blog
 
-
 set blog(edit_url) [export_vars -base "${package_url}entry-edit" { entry_id return_url }]
 if {$perma_p} {
     set blog(delete_url) [export_vars -base "${package_url}entry-delete" { entry_id {return_url $package_url} }]
@@ -75,9 +74,11 @@
 set display_categories [lars_blog_categories_p \
                             -package_id [ad_conn package_id]]
 
+set comment_return_url "${package_url}flush-cache?[export_vars { return_url }]"
+
 if { [template::util::is_true $show_comments_p] } {
     lars_blogger::entry::get_comments -entry_id $entry_id
-    set blog(comment_add_url) [export_vars -base "${general_comments_package_url}comment-add" { { object_id $entry_id } { object_name $blog(title) } { return_url "${package_url}flush-cache?[export_vars { return_url }]"} }]
+    set blog(comment_add_url) [export_vars -base "${general_comments_package_url}comment-add" { { object_id $entry_id } { object_name $blog(title) } { return_url "$comment_return_url"} }]
 }
 
 set blog(posted_time_pretty) [util::age_pretty \