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.109 -r1.110
--- openacs-4/packages/xowiki/tcl/xowiki-portlet-procs.tcl	9 Nov 2007 09:01:50 -0000	1.109
+++ openacs-4/packages/xowiki/tcl/xowiki-portlet-procs.tcl	10 Nov 2007 13:32:01 -0000	1.110
@@ -206,18 +206,8 @@
     return [list $cnames $extra_where_clause]
   }
 
-  ::xowiki::Portlet instproc require_page {source} {
-    if {$source ne ""} {
-      my instvar package_id
-      set page [$package_id resolve_page $source __m]
-      if {$page eq ""} {
-        error "Cannot find page '$source'"
-      }
-      $page destroy_on_cleanup
-    } else {
-      set page [my set __including_page]
-    }
-    return $page
+  ::xowiki::Portlet instproc resolve_page_name {page_name} {
+    return [[my set __including_page] resolve_included_page_name $page_name]
   }  
 
   ::xowiki::Portlet instproc get_page_order {-source -ordered_pages -pages} {
@@ -227,7 +217,7 @@
     # denoted by source
     #
     if {[info exists source]} {
-      set p [my require_page $source]
+      set p [my resolve_page_name $source]
       if {$p ne ""} {
 	array set ia [$p set instance_attributes]
 	if {[info exists ia(pages)]} {
@@ -340,7 +330,7 @@
         if {![info exists variable] && ![info exists form_variable]} {
           return "either -variable or -form_variable must be specified"
         }
-        set page [my require_page $source]
+        set page [my resolve_page_name $source]
 
         if {[info exists variable] && [$page exists $variable]} {
           return [$page set $variable]
@@ -367,7 +357,7 @@
         }}
       } -instproc render {} {
         my get_parameters
-        set page [my require_page $source]
+        set page [my resolve_page_name $source]
         set time [$page set creation_date]
         regexp {^([^.]+)[.]} $time _ time
         return [clock format [clock scan $time] -format $format]