Index: openacs-4/packages/xowiki/tcl/package-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/package-procs.tcl,v
diff -u -N -r1.240 -r1.241
--- openacs-4/packages/xowiki/tcl/package-procs.tcl	20 Jan 2011 11:21:25 -0000	1.240
+++ openacs-4/packages/xowiki/tcl/package-procs.tcl	14 Feb 2011 11:16:03 -0000	1.241
@@ -123,7 +123,7 @@
       # Determine lang and name from a path with slashes
       #
       if {[regexp {^pages/(..)/(.*)$} $path _ lang local_name]} {
-      } elseif {[regexp {^(..)/(.*)$} $path _ lang local_name]} {
+      } elseif {[regexp {^([a-z][a-z])/(.*)$} $path _ lang local_name]} {
 
         # TODO we should be able to get rid of this by using a canonical /folder/ in 
         # case of potential conflicts, like for file....
@@ -404,6 +404,10 @@
     # return the package_id. If we cannot resolve the name, turn 0.
     #
     my upvar $name_var name
+
+    # Set output variable always to some value
+    set name $path
+
     if {[regexp {^/(/.*)$} $path _ path]} {
       array set "" [site_node::get_from_url -url $path]
       if {$(package_key) eq "acs-subsite"} {