Index: openacs-4/packages/xowiki/tcl/form-field-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/form-field-procs.tcl,v
diff -u -r1.163 -r1.164
--- openacs-4/packages/xowiki/tcl/form-field-procs.tcl	26 Nov 2009 15:27:04 -0000	1.163
+++ openacs-4/packages/xowiki/tcl/form-field-procs.tcl	27 Nov 2009 16:15:43 -0000	1.164
@@ -1832,7 +1832,7 @@
   #
   ###########################################################
   Class youtube_url -superclass text
-  youtube_url set urlre {^http://www.youtube.com/watch[?]v=(.*)$}
+  youtube_url set urlre {^http://www.youtube.com/watch[?]v=([^?]+)([?]?)}
   
   youtube_url instproc initialize {} {
     next
Index: openacs-4/packages/xowiki/tcl/link-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/link-procs.tcl,v
diff -u -r1.74 -r1.75
--- openacs-4/packages/xowiki/tcl/link-procs.tcl	24 Nov 2009 21:42:00 -0000	1.74
+++ openacs-4/packages/xowiki/tcl/link-procs.tcl	27 Nov 2009 16:15:43 -0000	1.75
@@ -123,7 +123,6 @@
     if {$item_id} {
       $page lappend references [list $item_id [my type]]
       ::xowiki::Package require $package_id
-      set l  [my pretty_link $item_id]
       my render_found [my pretty_link $item_id] [my label]
     } else {
       $page incr unresolved_references
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 -r1.188 -r1.189
--- openacs-4/packages/xowiki/tcl/package-procs.tcl	26 Nov 2009 11:16:44 -0000	1.188
+++ openacs-4/packages/xowiki/tcl/package-procs.tcl	27 Nov 2009 16:15:43 -0000	1.189
@@ -283,8 +283,13 @@
     
     set encoded_name [string map [list %2d - %5f _ %2e .] [ns_urlencode $name]]
     set folder [my folder_path -parent_id $parent_id]
+    if {$folder ne ""} {
+      # if folder has a different language than the content, we have to provide a prefix....
+      regexp {^(..):} $folder _ default_lang
+    }
 
     #my log "h=${host}, prefix=${package_prefix}, folder=$folder, name=$encoded_name anchor=$anchor download=$download"
+    #my msg folder=$folder,lang=$lang,default_lang=$default_lang
     if {$download} {
       #
       # use the special download (file) syntax
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 -r1.379 -r1.380
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	26 Nov 2009 11:16:44 -0000	1.379
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	27 Nov 2009 16:15:43 -0000	1.380
@@ -2178,6 +2178,7 @@
     if {$trylocal && [my isform]} {
       return [my property form_constraints]
     } else {
+      #my msg "get_form_constraints returns '[my get_from_template form_constraints]'"
       return [my get_from_template form_constraints]
     }
   }
@@ -2196,12 +2197,15 @@
     #my msg "parent of self [my name] is [$form_obj name] type [$form_obj info class]"
     #
     # If it is as well a PageInstance, we find the information in the
-    # properties of this page.
+    # properties of this page. Note, that we cannot distinguish here between 
+    # intrinsic (starting with _) and extension variables, since get_from
+    # template does not know about the logic with "_" (just "property" does). 
     #
     if {[$form_obj istype ::xowiki::PageInstance]} {
-      #my msg "returning parent property [$form_obj property $var]"
+      #my msg "returning property $var from parent formpage => '[$form_obj property $var]'"
       return [$form_obj property $var]
     }
+
     #
     # .... otherwise, it should be an instance variable ....
     #
@@ -2723,6 +2727,8 @@
                      [::xo::db::CrClass set common_query_atts]]
 
     set template [lindex [my get_from_template text] 0]
+    #my msg template=$template
+
     #set field_names [list _name _title _description _creator _nls_language _page_order]
     set field_names [list]
     if {$form eq ""} {set form [my get_form]}