Index: openacs-4/packages/lars-blogger/www/blog.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/blog.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/lars-blogger/www/blog.adp	14 Sep 2002 22:05:25 -0000	1.6
+++ openacs-4/packages/lars-blogger/www/blog.adp	14 Sep 2002 22:17:41 -0000	1.7
@@ -8,7 +8,7 @@
   </table>
   <group column="entry_date">
     <div style="border-bottom:1px dashed #3366cc; padding-bottom:14px;">
-      <include src="entry-chunk" &="blog">
+      <include src="entry-chunk" &="blog" package_id="@package_id@">
     </div>
   </group>
 </multiple>
Index: openacs-4/packages/lars-blogger/www/blog.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/blog.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/lars-blogger/www/blog.tcl	14 Sep 2002 22:05:25 -0000	1.5
+++ openacs-4/packages/lars-blogger/www/blog.tcl	14 Sep 2002 22:17:41 -0000	1.6
@@ -31,7 +31,7 @@
 
 set show_poster_p [ad_parameter "ShowPosterP" "" "1"]
 
-set package_url [lars_blog_public_package_url]
+set package_url [lars_blog_public_package_url -package_id $package_id]
 
 set admin_p [ad_permission_p $package_id admin]
 
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.1 -r1.2
--- openacs-4/packages/lars-blogger/www/entry-chunk.tcl	14 Sep 2002 16:40:34 -0000	1.1
+++ openacs-4/packages/lars-blogger/www/entry-chunk.tcl	14 Sep 2002 22:17:41 -0000	1.2
@@ -15,22 +15,24 @@
     set return_url "[ad_conn url]?[ad_conn query]"
 }
 
+set package_url [lars_blog_public_package_url -package_id $package_id]
+
 set show_poster_p [ad_parameter "ShowPosterP" "" "1"]
 
 set blog(title) [ad_quotehtml $blog(title)]
 set blog(content) [ns_adp_parse -string $blog(content)]
 
 set entry_id $blog(entry_id)
 
-set blog(edit_url) "[ad_conn package_url]admin/entry-edit?[export_vars { entry_id return_url }]"
-set blog(delete_url) "[ad_conn package_url]admin/entry-delete?[export_vars { entry_id return_url }]"
+set blog(edit_url) "${package_url}admin/entry-edit?[export_vars { entry_id return_url }]"
+set blog(delete_url) "${package_url}admin/entry-delete?[export_vars { entry_id return_url }]"
 
-set blog(publish_url) "[ad_conn package_url]admin/entry-publish?[export_vars { entry_id return_url }]"
-set blog(revoke_url) "[ad_conn package_url]admin/entry-revoke?[export_vars { entry_id return_url }]"
+set blog(publish_url) "${package_url}admin/entry-publish?[export_vars { entry_id return_url }]"
+set blog(revoke_url) "${package_url}admin/entry-revoke?[export_vars { entry_id return_url }]"
 
-set blog(entry_archive_url) "[ad_conn package_url]one-entry?[export_vars { entry_id }]"
+set blog(entry_archive_url) "${package_url}one-entry?[export_vars { entry_id }]"
 set blog(google_url) "http://www.google.com/search?[export_vars { {q $blog(title) } }]"
-set blog(comment_add_url) "[general_comments_package_url]comment-add?[export_vars { { object_id $entry_id } { object_name $blog(title) } { return_url "[ad_conn package_url]flush-cache?[export_vars { return_url }]"} }]"
+set blog(comment_add_url) "[general_comments_package_url]comment-add?[export_vars { { object_id $entry_id } { object_name $blog(title) } { return_url "${package_url}flush-cache?[export_vars { return_url }]"} }]"
 
 if { [string equal $show_comments_p "t"] } {
     set comments_html [general_comments_get_comments -print_content_p 1 $entry_id]