Index: openacs-4/packages/xotcl-core/tcl/05-db-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/05-db-procs.tcl,v
diff -u -r1.148.2.40 -r1.148.2.41
--- openacs-4/packages/xotcl-core/tcl/05-db-procs.tcl	7 Sep 2021 17:35:50 -0000	1.148.2.40
+++ openacs-4/packages/xotcl-core/tcl/05-db-procs.tcl	7 Sep 2021 17:51:09 -0000	1.148.2.41
@@ -77,7 +77,6 @@
   ::xotcl::Class create ::xo::db::postgresql -superclass ::xo::db::SQL
 
   ::xo::db::postgresql instproc map_datatype {type} {
-  } {
     switch -- $type {
       string    { set type text }
       long_text { set type text }
Index: openacs-4/packages/xotcl-core/tcl/20-Ordered-Composite-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/20-Ordered-Composite-procs.tcl,v
diff -u -r1.27.2.10 -r1.27.2.11
--- openacs-4/packages/xotcl-core/tcl/20-Ordered-Composite-procs.tcl	7 Sep 2021 14:11:27 -0000	1.27.2.10
+++ openacs-4/packages/xotcl-core/tcl/20-Ordered-Composite-procs.tcl	7 Sep 2021 17:51:10 -0000	1.27.2.11
@@ -45,23 +45,16 @@
       return ""
     }
 
-    set sort_p false
-
     if {[info exists :__orderby] && [llength ${:__children}] > 0} {
       set firstChild [lindex ${:__children} 0]
       if {[$firstChild exists ${:__orderby}]} {
-        set sort_p true
-      } else {
-        ad_log warning "invalid sorting criterion '${:__orderby}'"
+        set order [expr {[info exists :__order] ? ${:__order} : "increasing"}]
+        return [lsort -command :__compare -$order ${:__children}]
+      } else {      
+        ad_log warning "ignore invalid sorting criterion '${:__orderby}'"
       }
     }
-
-    if {$sort_p} {
-      set order [expr {[info exists :__order] ? ${:__order} : "increasing"}]
-      return [lsort -command :__compare -$order ${:__children}]
-    } else {
-      return ${:__children}
-    }
+    return ${:__children}
   }
 
   OrderedComposite instproc add obj {