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 -r1.542.2.88 -r1.542.2.89
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	27 Sep 2020 17:56:56 -0000	1.542.2.88
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	28 Sep 2020 18:24:29 -0000	1.542.2.89
@@ -3884,13 +3884,25 @@
   PageInstance instproc render_content {} {
     set html [:get_html_from_content [:get_from_template text]]
     set html [:adp_subst $html]
+    #
+    # Transitional code, should be removed after the release of
+    # OpenACS 5.10: In case we have a folder instances without the
+    # "description" field set, and we use the new folder.form, and the
+    # update script was not yet executed, folders might appear as
+    # empty. In htese cases, call child-resosurces manually.
+    #
+    if {$html eq "" && [:is_folder_page]} {
+      set html [:include child-resources]
+    }
+
     return "<div class='[${:page_template} css_class_name -margin_form false]'>[:substitute_markup $html]</div>"
   }
   PageInstance instproc template_vars {content} {
     set result [list]
     foreach {_ _ v} [regexp -inline -all [template::adp_variable_regexp] $content] {
       lappend result $v ""
     }
+    
     return $result
   }