Index: openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl,v
diff -u -r1.31 -r1.32
--- openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl	20 Apr 2009 14:05:32 -0000	1.31
+++ openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl	8 May 2009 09:12:15 -0000	1.32
@@ -52,6 +52,7 @@
 {<master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
+  <if @item_id@ not nil><property name="displayed_object_id">@item_id@</property></if> 
   <property name="&body">property_body</property>
   <property name="&doc">property_doc</property>
   <property name="header_stuff">
@@ -124,7 +125,7 @@
     if {[catch {set f [open $filename w]} errorMsg]} {
       my log "Warning: cannot overwrite $filename, ignoring possible changes"
     } else {
-      puts -nonewline $f [my generate]
+      ::puts -nonewline $f [my generate]
       close $f
     }
   }
Index: openacs-4/packages/xowiki/tcl/includelet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/includelet-procs.tcl,v
diff -u -r1.110 -r1.111
--- openacs-4/packages/xowiki/tcl/includelet-procs.tcl	23 Apr 2009 06:18:50 -0000	1.110
+++ openacs-4/packages/xowiki/tcl/includelet-procs.tcl	8 May 2009 09:12:15 -0000	1.111
@@ -894,7 +894,7 @@
     set admin_p [::xo::cc permission -object_id $package_id -privilege admin \
                      -party_id [::xo::cc set untrusted_user_id]]
     set show_heritage $admin_p
-    
+
     TableWidget t1 -volatile \
         -set allow_edit $allow_edit \
         -set allow_delete $allow_delete \
@@ -966,7 +966,7 @@
           [t1 last_child] set inherited $label
           [t1 last_child] set inherited.href $href
           [t1 last_child] set inherited.title $title
-          #[t1 last_child] set inherited.CSSclass $class
+          [t1 last_child] set inherited.CSSclass $class
         }
       }
     return [t1 asHTML]
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.359 -r1.360
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	30 Apr 2009 09:12:23 -0000	1.359
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	8 May 2009 09:12:15 -0000	1.360
@@ -2368,7 +2368,7 @@
       foreach p [$items children] {
         array set __ia $init_vars
         array set __ia [$p instance_attributes]
-        if {![expr $wc(tcl)]} {$items delete $p}
+        if {![$p eval expr $wc(tcl)]} {$items delete $p}
       }
     }
     return $items
Index: openacs-4/packages/xowiki/tcl/xowiki-utility-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-utility-procs.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/xowiki/tcl/xowiki-utility-procs.tcl	23 Apr 2009 10:18:57 -0000	1.5
+++ openacs-4/packages/xowiki/tcl/xowiki-utility-procs.tcl	8 May 2009 09:12:15 -0000	1.6
@@ -205,10 +205,10 @@
     return $content
   }
   proc write_file {fn content} {
-    set F [open $fn w]
-    fconfigure $F -translation binary
-    puts -nonewline $F $content
-    close $F
+    set F [::open $fn w]
+    ::fconfigure $F -translation binary
+    ::puts -nonewline $F $content
+    ::close $F
   }
 
   proc ::xowiki::page_order_uses_ltree {} {
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.231 -r1.232
--- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	30 Apr 2009 09:02:05 -0000	1.231
+++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	8 May 2009 09:12:15 -0000	1.232
@@ -1715,7 +1715,7 @@
     while { $i < [llength $lines1] } {
       set l [lindex $lines1 $i]
       incr i
-      puts "$i\t\t$l"
+      #puts "$i\t\t$l"
       append out "<span class='removed'>$l</span>\n"
     }
     while { $j < [llength $lines2] } {
Index: openacs-4/packages/xowiki/www/oacs-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/oacs-view.adp,v
diff -u -r1.57 -r1.58
--- openacs-4/packages/xowiki/www/oacs-view.adp	12 Mar 2009 12:43:17 -0000	1.57
+++ openacs-4/packages/xowiki/www/oacs-view.adp	8 May 2009 09:12:15 -0000	1.58
@@ -1,7 +1,8 @@
-<!-- Generated by ::xowiki::ADP_Generator on Do Mär 12 13:42:25 CET 2009 -->
+<!-- Generated by ::xowiki::ADP_Generator on Do Mai 07 20:05:14 CEST 2009 -->
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
+  <if @item_id@ not nil><property name="displayed_object_id">@item_id@</property></if> 
   <property name="&body">property_body</property>
   <property name="&doc">property_doc</property>
   <property name="header_stuff">
Index: openacs-4/packages/xowiki/www/oacs-view2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/oacs-view2.adp,v
diff -u -r1.36 -r1.37
--- openacs-4/packages/xowiki/www/oacs-view2.adp	12 Mar 2009 12:43:17 -0000	1.36
+++ openacs-4/packages/xowiki/www/oacs-view2.adp	8 May 2009 09:12:15 -0000	1.37
@@ -1,7 +1,8 @@
-<!-- Generated by ::xowiki::ADP_Generator on Do Mär 12 13:42:25 CET 2009 -->
+<!-- Generated by ::xowiki::ADP_Generator on Do Mai 07 20:05:14 CEST 2009 -->
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
+  <if @item_id@ not nil><property name="displayed_object_id">@item_id@</property></if> 
   <property name="&body">property_body</property>
   <property name="&doc">property_doc</property>
   <property name="header_stuff">
Index: openacs-4/packages/xowiki/www/oacs-view3.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/oacs-view3.adp,v
diff -u -r1.31 -r1.32
--- openacs-4/packages/xowiki/www/oacs-view3.adp	12 Mar 2009 12:43:17 -0000	1.31
+++ openacs-4/packages/xowiki/www/oacs-view3.adp	8 May 2009 09:12:16 -0000	1.32
@@ -1,7 +1,8 @@
-<!-- Generated by ::xowiki::ADP_Generator on Do Mär 12 13:42:25 CET 2009 -->
+<!-- Generated by ::xowiki::ADP_Generator on Do Mai 07 20:05:14 CEST 2009 -->
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
+  <if @item_id@ not nil><property name="displayed_object_id">@item_id@</property></if> 
   <property name="&body">property_body</property>
   <property name="&doc">property_doc</property>
   <property name="header_stuff">
Index: openacs-4/packages/xowiki/www/view-book-no-ajax.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/view-book-no-ajax.adp,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/xowiki/www/view-book-no-ajax.adp	12 Mar 2009 12:43:17 -0000	1.13
+++ openacs-4/packages/xowiki/www/view-book-no-ajax.adp	8 May 2009 09:12:16 -0000	1.14
@@ -1,7 +1,8 @@
-<!-- Generated by ::xowiki::ADP_Generator on Do Mär 12 13:42:25 CET 2009 -->
+<!-- Generated by ::xowiki::ADP_Generator on Do Mai 07 20:05:14 CEST 2009 -->
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
+  <if @item_id@ not nil><property name="displayed_object_id">@item_id@</property></if> 
   <property name="&body">property_body</property>
   <property name="&doc">property_doc</property>
   <property name="header_stuff">
Index: openacs-4/packages/xowiki/www/view-book.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/view-book.adp,v
diff -u -r1.24 -r1.25
--- openacs-4/packages/xowiki/www/view-book.adp	12 Mar 2009 12:43:17 -0000	1.24
+++ openacs-4/packages/xowiki/www/view-book.adp	8 May 2009 09:12:16 -0000	1.25
@@ -1,7 +1,8 @@
-<!-- Generated by ::xowiki::ADP_Generator on Do Mär 12 13:42:25 CET 2009 -->
+<!-- Generated by ::xowiki::ADP_Generator on Do Mai 07 20:05:14 CEST 2009 -->
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
+  <if @item_id@ not nil><property name="displayed_object_id">@item_id@</property></if> 
   <property name="&body">property_body</property>
   <property name="&doc">property_doc</property>
   <property name="header_stuff">
Index: openacs-4/packages/xowiki/www/view-default.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/view-default.adp,v
diff -u -r1.53 -r1.54
--- openacs-4/packages/xowiki/www/view-default.adp	12 Mar 2009 12:43:17 -0000	1.53
+++ openacs-4/packages/xowiki/www/view-default.adp	8 May 2009 09:12:16 -0000	1.54
@@ -1,7 +1,8 @@
-<!-- Generated by ::xowiki::ADP_Generator on Do Mär 12 13:42:25 CET 2009 -->
+<!-- Generated by ::xowiki::ADP_Generator on Do Mai 07 20:05:14 CEST 2009 -->
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
+  <if @item_id@ not nil><property name="displayed_object_id">@item_id@</property></if> 
   <property name="&body">property_body</property>
   <property name="&doc">property_doc</property>
   <property name="header_stuff">
Index: openacs-4/packages/xowiki/www/view-links.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/view-links.adp,v
diff -u -r1.43 -r1.44
--- openacs-4/packages/xowiki/www/view-links.adp	12 Mar 2009 12:43:17 -0000	1.43
+++ openacs-4/packages/xowiki/www/view-links.adp	8 May 2009 09:12:16 -0000	1.44
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Do Mär 12 13:42:25 CET 2009 -->
+<!-- Generated by ::xowiki::ADP_Generator on Do Mai 07 20:05:14 CEST 2009 -->
 <!-- The following DIV is needed for overlib to function! -->
   <div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>	
 <div class='xowiki-content'>
Index: openacs-4/packages/xowiki/www/view-plain.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/view-plain.adp,v
diff -u -r1.39 -r1.40
--- openacs-4/packages/xowiki/www/view-plain.adp	12 Mar 2009 12:43:17 -0000	1.39
+++ openacs-4/packages/xowiki/www/view-plain.adp	8 May 2009 09:12:16 -0000	1.40
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Do Mär 12 13:42:25 CET 2009 -->
+<!-- Generated by ::xowiki::ADP_Generator on Do Mai 07 20:05:14 CEST 2009 -->
 <!-- The following DIV is needed for overlib to function! -->
   <div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>	
 <div class='xowiki-content'>