Index: openacs-4/packages/forums/www/forum-view-statistic.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/forum-view-statistic.adp,v
diff -u -r1.2.6.1 -r1.2.6.2
--- openacs-4/packages/forums/www/forum-view-statistic.adp	11 Sep 2013 09:50:45 -0000	1.2.6.1
+++ openacs-4/packages/forums/www/forum-view-statistic.adp	14 Jul 2014 17:26:01 -0000	1.2.6.2
@@ -3,4 +3,4 @@
 <property name="context">@context;noquote@</property>
 
 
-<include src="/packages/forums/lib/forums/forums-history-chunk" forum_id="@forum_id@" name="@name@">
+<include src="/packages/forums/lib/forums/forums-history-chunk" &="forum_id" &="name">
Index: openacs-4/packages/forums/www/forum-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/forum-view.adp,v
diff -u -r1.38 -r1.38.4.1
--- openacs-4/packages/forums/www/forum-view.adp	2 Sep 2008 22:11:53 -0000	1.38
+++ openacs-4/packages/forums/www/forum-view.adp	14 Jul 2014 17:26:01 -0000	1.38.4.1
@@ -5,11 +5,11 @@
 
 <h1>@page_title;noquote@</h1>
 <if @searchbox_p@ true>
-  <include src="/packages/forums/lib/search/search-form" forum_id="@forum_id@">
+  <include src="/packages/forums/lib/search/search-form" &="forum_id">
 </if>
 
 <p>
 @notification_chunk;noquote@
 </p>
 
-<include src="/packages/forums/lib/message/threads-chunk" forum_id="@forum_id@" flush_p="@flush_p@" &="permissions" moderate_p="@permissions.moderate_p@" orderby="@orderby@" &="page" admin_p="@permissions.admin_p@">
+<include src="/packages/forums/lib/message/threads-chunk" &="forum_id" &="flush_p" &="permissions" moderate_p="@permissions.moderate_p;literal@" &="orderby" &="page" admin_p="@permissions.admin_p;literal@">
Index: openacs-4/packages/forums/www/message-post-confirm.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/message-post-confirm.adp,v
diff -u -r1.17.6.1 -r1.17.6.2
--- openacs-4/packages/forums/www/message-post-confirm.adp	11 Sep 2013 09:50:45 -0000	1.17.6.1
+++ openacs-4/packages/forums/www/message-post-confirm.adp	14 Jul 2014 17:26:01 -0000	1.17.6.2
@@ -2,7 +2,7 @@
 <property name="doc(title)">#forums.Confirm_Post_to_Forum# @forum.name;noquote@</property>
 <property name="context">@context;noquote@</property>
 
-<include src="/packages/forums/lib/message/post" forum_id="@forum_id@" 
-                             &parent_message="parent_message"
-                             anonymous_allowed_p="@anonymous_allowed_p@"
-                             attachments_enabled_p="@attachments_enabled_p@">
+<include src="/packages/forums/lib/message/post" &="forum_id" 
+                             &="parent_message"
+                             &="anonymous_allowed_p"
+                             &="attachments_enabled_p">
Index: openacs-4/packages/forums/www/message-post.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/message-post.adp,v
diff -u -r1.13.6.1 -r1.13.6.2
--- openacs-4/packages/forums/www/message-post.adp	11 Sep 2013 09:50:45 -0000	1.13.6.1
+++ openacs-4/packages/forums/www/message-post.adp	14 Jul 2014 17:26:01 -0000	1.13.6.2
@@ -3,7 +3,7 @@
 <property name="context">@context;noquote@</property>
 <property name="focus">message.subject</property>
 
-<include src="/packages/forums/lib/message/post" forum_id="@forum_id@" 
-                             &parent_message="parent_message"
-                             anonymous_allowed_p="@anonymous_allowed_p@"
-                             attachments_enabled_p="@attachments_enabled_p@">
+<include src="/packages/forums/lib/message/post" &="forum_id" 
+                             &="parent_message"
+                             &="anonymous_allowed_p"
+                             &="attachments_enabled_p">
Index: openacs-4/packages/forums/www/message-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/message-view.adp,v
diff -u -r1.39.4.1 -r1.39.4.2
--- openacs-4/packages/forums/www/message-view.adp	11 Sep 2013 09:50:45 -0000	1.39.4.1
+++ openacs-4/packages/forums/www/message-view.adp	14 Jul 2014 17:26:01 -0000	1.39.4.2
@@ -6,7 +6,7 @@
 <h1>@page_title;noquote@</h1>
 
   <if @searchbox_p@ true>
-    <include src="/packages/forums/lib/search/search-form" forum_id="@message.forum_id@">
+    <include src="/packages/forums/lib/search/search-form" forum_id="@message.forum_id;literal@">
   </if>
 
   <ul class="action-links">