Index: openacs-4/packages/xowiki/www/prototypes/ical.page
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/prototypes/ical.page,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/xowiki/www/prototypes/ical.page	16 Sep 2008 15:08:07 -0000	1.4
+++ openacs-4/packages/xowiki/www/prototypes/ical.page	17 Jun 2010 10:41:42 -0000	1.5
@@ -36,7 +36,7 @@
 DTSTART:$dtstart
 DTEND:$dtend
 $body
-URL:[[my package_id] pretty_link -absolute true [my name]]
+URL:[my pretty_link -absolute true]
 END:VEVENT
 }]
   }
Index: openacs-4/packages/xowiki/www/prototypes/news.page
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/prototypes/news.page,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/xowiki/www/prototypes/news.page	4 Jun 2010 12:22:43 -0000	1.15
+++ openacs-4/packages/xowiki/www/prototypes/news.page	17 Jun 2010 10:41:42 -0000	1.16
@@ -34,8 +34,14 @@
                  -forms $entries_of \
                  -package_id $package_id]
   set template_id [lindex $forms 0]
-  set form_link [$package_id pretty_link [$template_id name]]
-  set new_link  [$package_id make_link -link $form_link $template_id create-new return_url]
+  if {$template_id ne ""} {
+    set form_link [$template_id pretty_link]
+    set new_link  [$package_id make_link -link $form_link $template_id create-new return_url]
+  } else {
+    ns_log notice "Warning: could not resolve $entries_of with -parent_id [my set current_folder_id]"
+    set form_link ""
+    set new_link ""
+  }
   
   [my info parent] set __link(new) $new_link
 
@@ -47,9 +53,7 @@
     my instvar package_id name title creator creation_user pretty_date description publish_date
     [my set __parent] instvar weblog_obj
 
-    set link [::xowiki::Includelet detail_link \
-                  -package_id $package_id -name $name \
-                  -instance_attributes [my get_instance_attributes]]
+    set link [my detail_link]
     regsub -all & $link "&" link
     set more [expr {[$weblog_obj summary] ? 
                     " <span class='more'> \[<a href='$link'>#xowiki.weblog-more#</a>\]</span>" : ""}]
Index: openacs-4/packages/xowiki/www/prototypes/weblog-portlet.page
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/prototypes/Attic/weblog-portlet.page,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/xowiki/www/prototypes/weblog-portlet.page	20 Jun 2008 09:50:42 -0000	1.15
+++ openacs-4/packages/xowiki/www/prototypes/weblog-portlet.page	17 Jun 2010 10:41:42 -0000	1.16
@@ -26,8 +26,7 @@
 
     # We get the instance_attributes, if these are available. For the
     # time being, we have these only in full mode (no summary)
-    set link [::xowiki::Includelet detail_link -package_id $package_id -name $name \
-                  -instance_attributes [my get_instance_attributes]]
+    set link [my detail_link]
     set show_more [expr {[$weblog_obj summary] && [my exists text] && [my text] ne ""}]
     set more [expr {$show_more ? 
                     " <span class='more'> \[<a href='$link'>#xowiki.weblog-more#</a>\]</span>" : ""}]