Index: openacs-4/packages/xowiki/tcl/xowiki-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-procs.tcl,v
diff -u -N -r1.542.2.60 -r1.542.2.61
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	15 Jan 2020 10:54:36 -0000	1.542.2.60
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	19 Jan 2020 19:18:08 -0000	1.542.2.61
@@ -1361,8 +1361,13 @@
   Page ad_instproc is_folder_page {
     {-include_folder_links true}
   } {
-    Check, if page is a folder. Pages are never folders.
-
+    
+    Check, if page is a folder.  This function is typically overlaaded
+    by specializations. Plain xwoiki::Pages are never folders.
+    
+    @param include_folder_links return true, if the current page is a
+           link to a folder.
+    
     @return boolean
   } {
     return 0
@@ -1375,6 +1380,8 @@
     page template is the folder.form or if this is a link pointing to
     a folder.
 
+    @param include_folder_links return true, if the current page is a
+           link to a folder.
     @return boolean
   } {
     #
@@ -2309,7 +2316,7 @@
 
   Page instforward item_ref {%my package_id} %proc
 
-  Page ad_instproc pretty_link {
+  Page instproc pretty_link {
     {-anchor ""}
     {-query ""}
     {-absolute:boolean false}
@@ -2318,12 +2325,9 @@
     {-download false}
     {-path_encode:boolean true}
   } {
-    @return the pretty_link for the current page
-  } {
-    # Make sure package is initialized
-    if {![nsf::is object ::${:package_id}]} {
-      ::xowiki::Package initialize -package_id ${:package_id}
-    }
+    
+    # return the pretty_link for the current page
+
     ${:package_id} pretty_link -parent_id ${:parent_id} \
         -anchor $anchor -query $query -absolute $absolute -siteurl $siteurl \
         -lang $lang -download $download -page [self] \