Index: openacs-4/packages/xowiki/tcl/weblog-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/weblog-procs.tcl,v
diff -u -r1.25 -r1.26
--- openacs-4/packages/xowiki/tcl/weblog-procs.tcl	28 Sep 2007 20:34:06 -0000	1.25
+++ openacs-4/packages/xowiki/tcl/weblog-procs.tcl	16 Oct 2007 19:04:57 -0000	1.26
@@ -95,7 +95,7 @@
     if {$locale ne ""} {
       #set locale "default+system"
       foreach {locale locale_clause} \
-	  [::xowiki::Portlet locale_clause -revisions p -items ci $package_id $locale] break
+	  [::xowiki::Portlet locale_clause -revisions bt -items ci $package_id $locale] break
       #my msg "--L locale_clause=$locale_clause"
       append extra_where_clause $locale_clause
     }
Index: openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl,v
diff -u -r1.104 -r1.105
--- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	11 Oct 2007 07:41:33 -0000	1.104
+++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	16 Oct 2007 19:04:57 -0000	1.105
@@ -1097,9 +1097,12 @@
     if {[my exists_query_parameter "return_url"]} {
       set return_url [my query_parameter "return_url"]
     }
+    if {[my exists_query_parameter "template_file"]} {
+      set template_file [my query_parameter "template_file"]
+    }
     $package_id returnredirect \
         [export_vars -base [$package_id pretty_link [$f name]] \
-	     {{m edit} return_url name}]
+	     {{m edit} return_url name template_file}]
   }