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.140 -r1.141
--- openacs-4/packages/xowiki/tcl/package-procs.tcl	8 Oct 2008 17:48:29 -0000	1.140
+++ openacs-4/packages/xowiki/tcl/package-procs.tcl	8 Oct 2008 19:49:14 -0000	1.141
@@ -169,9 +169,12 @@
       return $name
     } 
     set folder [my folder_path -parent_id $parent_id]
-    my get_lang_and_name -name $name lang stripped_name
-    #return ${lang}:$folder$stripped_name
-    return $folder$stripped_name
+    if {$folder ne ""} {
+      my get_lang_and_name -name $name lang stripped_name
+      return $folder$stripped_name
+    }
+    return $name
+
   }
 
   Package ad_instproc pretty_link {
@@ -1332,7 +1335,7 @@
     Class FormPage -array set require_permission {
       view               creator 
       edit               {
-        {{in_state initial} creator} admin
+        {{in_state initial|suspended|working} creator} admin
       }
     }
     Class Form -array set require_permission {
Index: openacs-4/packages/xowiki/tcl/xowiki-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-procs.tcl,v
diff -u -N -r1.297 -r1.298
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	8 Oct 2008 17:21:33 -0000	1.297
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	8 Oct 2008 19:49:14 -0000	1.298
@@ -1937,6 +1937,7 @@
   FormPage instproc condition=in_state {query_context value} {
     # possible values can be or-ed together (e.g. initial|final)
     foreach v [split $value |] {
+      #my msg "check [my state] eq $v"
       if {[my state] eq $v} {return 1}
     }
     return 0