Index: openacs-4/packages/xowiki/tcl/xowiki-portlet-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/Attic/xowiki-portlet-procs.tcl,v diff -u -r1.60 -r1.61 --- openacs-4/packages/xowiki/tcl/xowiki-portlet-procs.tcl 12 Jun 2007 10:35:08 -0000 1.60 +++ openacs-4/packages/xowiki/tcl/xowiki-portlet-procs.tcl 15 Jun 2007 07:29:40 -0000 1.61 @@ -354,8 +354,18 @@ } else { foreach {orderby direction} [split $order_items_by ,] break ;# e.g. "title,asc" set increasing [expr {$direction ne "desc"}] - set order_column [expr {[::xo::db::has_ltree] ? ", p.page_order" : ""}] - #my log "--CAT $increasing $order_column" + + # + # If we have ltree, we query the order_column from the database, + # otherwise we don't retrieve it, but set the Tcl variable page_order empty. + # + if {[::xo::db::has_ltree]} { + set order_column ", p.page_order" + } else { + set order_column "" + set page_order "" + } + db_foreach [my qn get_pages] \ "select ci.item_id, ci.name, ci.content_type, r.title, category_id $order_column from $sql" { if {$title eq ""} {set title $name} @@ -381,7 +391,7 @@ namespace eval ::xowiki::portlet { ############################################################################# - # $Id$ + # # display recent entries by categories # -gustaf neumann # Index: openacs-4/packages/xowiki/www/oacs-view.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/oacs-view.adp,v diff -u -r1.36 -r1.37 --- openacs-4/packages/xowiki/www/oacs-view.adp 8 Jun 2007 12:04:14 -0000 1.36 +++ openacs-4/packages/xowiki/www/oacs-view.adp 15 Jun 2007 07:29:40 -0000 1.37 @@ -1,4 +1,4 @@ - + @title;noquote@ @context;noquote@ Index: openacs-4/packages/xowiki/www/oacs-view2.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/oacs-view2.adp,v diff -u -r1.15 -r1.16 --- openacs-4/packages/xowiki/www/oacs-view2.adp 8 Jun 2007 12:04:14 -0000 1.15 +++ openacs-4/packages/xowiki/www/oacs-view2.adp 15 Jun 2007 07:29:40 -0000 1.16 @@ -1,4 +1,4 @@ - + @title;noquote@ @context;noquote@ Index: openacs-4/packages/xowiki/www/oacs-view3.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/oacs-view3.adp,v diff -u -r1.10 -r1.11 --- openacs-4/packages/xowiki/www/oacs-view3.adp 8 Jun 2007 12:04:14 -0000 1.10 +++ openacs-4/packages/xowiki/www/oacs-view3.adp 15 Jun 2007 07:29:40 -0000 1.11 @@ -1,4 +1,4 @@ - + @title;noquote@ @context;noquote@ Index: openacs-4/packages/xowiki/www/view-default.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/view-default.adp,v diff -u -r1.32 -r1.33 --- openacs-4/packages/xowiki/www/view-default.adp 8 Jun 2007 12:04:14 -0000 1.32 +++ openacs-4/packages/xowiki/www/view-default.adp 15 Jun 2007 07:29:40 -0000 1.33 @@ -1,4 +1,4 @@ - + @title;noquote@ @context;noquote@ Index: openacs-4/packages/xowiki/www/view-links.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/view-links.adp,v diff -u -r1.22 -r1.23 --- openacs-4/packages/xowiki/www/view-links.adp 8 Jun 2007 12:04:14 -0000 1.22 +++ openacs-4/packages/xowiki/www/view-links.adp 15 Jun 2007 07:29:40 -0000 1.23 @@ -1,4 +1,4 @@ - +
Index: openacs-4/packages/xowiki/www/view-plain.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/view-plain.adp,v diff -u -r1.18 -r1.19 --- openacs-4/packages/xowiki/www/view-plain.adp 8 Jun 2007 12:04:14 -0000 1.18 +++ openacs-4/packages/xowiki/www/view-plain.adp 15 Jun 2007 07:29:40 -0000 1.19 @@ -1,4 +1,4 @@ - +