Index: openacs-4/packages/xowiki/resources/templates/oacs-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/resources/templates/oacs-view.adp,v
diff -u -r1.5.2.4 -r1.5.2.5
--- openacs-4/packages/xowiki/resources/templates/oacs-view.adp	21 Nov 2019 13:53:29 -0000	1.5.2.4
+++ openacs-4/packages/xowiki/resources/templates/oacs-view.adp	26 Jan 2020 18:05:58 -0000	1.5.2.5
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Thu Nov 21 14:52:01 CET 2019 -->
+<!-- Generated by ::xowiki::ADP_Generator on Sun Jan 26 18:57:43 CET 2020 -->
 <master>
                   <property name="context">@context;literal@</property>
                   <if @item_id@ not nil><property name="displayed_object_id">@item_id;literal@</property></if>
@@ -13,7 +13,7 @@
           <div class='xowiki-content'>
 
       <%
-      if {$::::xowiki::search_mounted_p} {
+      if {$::xowiki::search_mounted_p} {
         template::add_event_listener  -id wiki-menu-do-search-control  -script {
             document.getElementById('do_search').style.display = 'inline';
             document.getElementById('do_search_q').focus();
Index: openacs-4/packages/xowiki/resources/templates/oacs-view2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/resources/templates/oacs-view2.adp,v
diff -u -r1.5.2.4 -r1.5.2.5
--- openacs-4/packages/xowiki/resources/templates/oacs-view2.adp	21 Nov 2019 13:53:29 -0000	1.5.2.4
+++ openacs-4/packages/xowiki/resources/templates/oacs-view2.adp	26 Jan 2020 18:05:58 -0000	1.5.2.5
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Thu Nov 21 14:52:01 CET 2019 -->
+<!-- Generated by ::xowiki::ADP_Generator on Sun Jan 26 18:57:43 CET 2020 -->
 <master>
                   <property name="context">@context;literal@</property>
                   <if @item_id@ not nil><property name="displayed_object_id">@item_id;literal@</property></if>
@@ -14,7 +14,7 @@
           <div class='xowiki-content'>
 
       <%
-      if {$::::xowiki::search_mounted_p} {
+      if {$::xowiki::search_mounted_p} {
         template::add_event_listener  -id wiki-menu-do-search-control  -script {
             document.getElementById('do_search').style.display = 'inline';
             document.getElementById('do_search_q').focus();
Index: openacs-4/packages/xowiki/resources/templates/oacs-view3-bootstrap3.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/resources/templates/oacs-view3-bootstrap3.adp,v
diff -u -r1.5.2.4 -r1.5.2.5
--- openacs-4/packages/xowiki/resources/templates/oacs-view3-bootstrap3.adp	21 Nov 2019 13:53:29 -0000	1.5.2.4
+++ openacs-4/packages/xowiki/resources/templates/oacs-view3-bootstrap3.adp	26 Jan 2020 18:05:58 -0000	1.5.2.5
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Thu Nov 21 14:52:01 CET 2019 -->
+<!-- Generated by ::xowiki::ADP_Generator on Sun Jan 26 18:57:43 CET 2020 -->
 <master>
                   <property name="context">@context;literal@</property>
                   <if @item_id@ not nil><property name="displayed_object_id">@item_id;literal@</property></if>
@@ -24,7 +24,7 @@
           <div class='xowiki-content'>
 
       <%
-      if {$::::xowiki::search_mounted_p} {
+      if {$::xowiki::search_mounted_p} {
         template::add_event_listener  -id wiki-menu-do-search-control  -script {
             document.getElementById('do_search').style.display = 'inline';
             document.getElementById('do_search_q').focus();
Index: openacs-4/packages/xowiki/resources/templates/oacs-view3.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/resources/templates/oacs-view3.adp,v
diff -u -r1.5.2.4 -r1.5.2.5
--- openacs-4/packages/xowiki/resources/templates/oacs-view3.adp	21 Nov 2019 13:53:29 -0000	1.5.2.4
+++ openacs-4/packages/xowiki/resources/templates/oacs-view3.adp	26 Jan 2020 18:05:58 -0000	1.5.2.5
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Thu Nov 21 14:52:01 CET 2019 -->
+<!-- Generated by ::xowiki::ADP_Generator on Sun Jan 26 18:57:43 CET 2020 -->
 <master>
                   <property name="context">@context;literal@</property>
                   <if @item_id@ not nil><property name="displayed_object_id">@item_id;literal@</property></if>
@@ -19,7 +19,7 @@
           <div class='xowiki-content'>
 
       <%
-      if {$::::xowiki::search_mounted_p} {
+      if {$::xowiki::search_mounted_p} {
         template::add_event_listener  -id wiki-menu-do-search-control  -script {
             document.getElementById('do_search').style.display = 'inline';
             document.getElementById('do_search_q').focus();
Index: openacs-4/packages/xowiki/resources/templates/view-book-no-ajax.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/resources/templates/view-book-no-ajax.adp,v
diff -u -r1.5.2.4 -r1.5.2.5
--- openacs-4/packages/xowiki/resources/templates/view-book-no-ajax.adp	21 Nov 2019 13:53:29 -0000	1.5.2.4
+++ openacs-4/packages/xowiki/resources/templates/view-book-no-ajax.adp	26 Jan 2020 18:05:58 -0000	1.5.2.5
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Thu Nov 21 14:52:01 CET 2019 -->
+<!-- Generated by ::xowiki::ADP_Generator on Sun Jan 26 18:57:43 CET 2020 -->
 <master>
                   <property name="context">@context;literal@</property>
                   <if @item_id@ not nil><property name="displayed_object_id">@item_id;literal@</property></if>
Index: openacs-4/packages/xowiki/resources/templates/view-book.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/resources/templates/view-book.adp,v
diff -u -r1.5.2.4 -r1.5.2.5
--- openacs-4/packages/xowiki/resources/templates/view-book.adp	21 Nov 2019 13:53:29 -0000	1.5.2.4
+++ openacs-4/packages/xowiki/resources/templates/view-book.adp	26 Jan 2020 18:05:58 -0000	1.5.2.5
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Thu Nov 21 14:52:01 CET 2019 -->
+<!-- Generated by ::xowiki::ADP_Generator on Sun Jan 26 18:57:43 CET 2020 -->
 <master>
                   <property name="context">@context;literal@</property>
                   <if @item_id@ not nil><property name="displayed_object_id">@item_id;literal@</property></if>
Index: openacs-4/packages/xowiki/resources/templates/view-default.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/resources/templates/view-default.adp,v
diff -u -r1.5.2.4 -r1.5.2.5
--- openacs-4/packages/xowiki/resources/templates/view-default.adp	21 Nov 2019 13:53:29 -0000	1.5.2.4
+++ openacs-4/packages/xowiki/resources/templates/view-default.adp	26 Jan 2020 18:05:58 -0000	1.5.2.5
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Thu Nov 21 14:52:01 CET 2019 -->
+<!-- Generated by ::xowiki::ADP_Generator on Sun Jan 26 18:57:43 CET 2020 -->
 <master>
                   <property name="context">@context;literal@</property>
                   <if @item_id@ not nil><property name="displayed_object_id">@item_id;literal@</property></if>
@@ -10,7 +10,7 @@
           <div class='xowiki-content'>
 
       <%
-      if {$::::xowiki::search_mounted_p} {
+      if {$::xowiki::search_mounted_p} {
         template::add_event_listener  -id wiki-menu-do-search-control  -script {
             document.getElementById('do_search').style.display = 'inline';
             document.getElementById('do_search_q').focus();
Index: openacs-4/packages/xowiki/resources/templates/view-links.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/resources/templates/view-links.adp,v
diff -u -r1.5.2.4 -r1.5.2.5
--- openacs-4/packages/xowiki/resources/templates/view-links.adp	21 Nov 2019 13:53:29 -0000	1.5.2.4
+++ openacs-4/packages/xowiki/resources/templates/view-links.adp	26 Jan 2020 18:05:58 -0000	1.5.2.5
@@ -1,10 +1,10 @@
-<!-- Generated by ::xowiki::ADP_Generator on Thu Nov 21 14:52:01 CET 2019 -->
+<!-- Generated by ::xowiki::ADP_Generator on Sun Jan 26 18:57:43 CET 2020 -->
 <!-- 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'>
 
       <%
-      if {$::::xowiki::search_mounted_p} {
+      if {$::xowiki::search_mounted_p} {
         template::add_event_listener  -id wiki-menu-do-search-control  -script {
             document.getElementById('do_search').style.display = 'inline';
             document.getElementById('do_search_q').focus();
Index: openacs-4/packages/xowiki/resources/templates/view-plain-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/resources/templates/view-plain-master.adp,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/xowiki/resources/templates/view-plain-master.adp	21 Nov 2019 13:53:29 -0000	1.1.2.1
+++ openacs-4/packages/xowiki/resources/templates/view-plain-master.adp	26 Jan 2020 18:05:58 -0000	1.1.2.2
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Thu Nov 21 14:52:01 CET 2019 -->
+<!-- Generated by ::xowiki::ADP_Generator on Sun Jan 26 18:57:43 CET 2020 -->
 <master>
                   <property name="context">@context;literal@</property>
                   <if @item_id@ not nil><property name="displayed_object_id">@item_id;literal@</property></if>
Index: openacs-4/packages/xowiki/resources/templates/view-plain.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/resources/templates/view-plain.adp,v
diff -u -r1.5.2.4 -r1.5.2.5
--- openacs-4/packages/xowiki/resources/templates/view-plain.adp	21 Nov 2019 13:53:29 -0000	1.5.2.4
+++ openacs-4/packages/xowiki/resources/templates/view-plain.adp	26 Jan 2020 18:05:58 -0000	1.5.2.5
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Thu Nov 21 14:52:01 CET 2019 -->
+<!-- Generated by ::xowiki::ADP_Generator on Sun Jan 26 18:57:43 CET 2020 -->
 <!-- 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'>