Index: openacs-4/packages/file-storage/lib/folder-links.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/lib/folder-links.adp,v
diff -u -r1.3 -r1.3.8.1
--- openacs-4/packages/file-storage/lib/folder-links.adp	11 Jan 2008 17:07:14 -0000	1.3
+++ openacs-4/packages/file-storage/lib/folder-links.adp	18 Jan 2017 07:50:07 -0000	1.3.8.1
@@ -1,8 +1,8 @@
-<if @permission_p@ eq 1>
+<if @permission_p@ true>
 <if @contents:rowcount@ gt 0>
 <multiple name="contents">
 <if @contents.type@ ne "folder">
-<a href="@contents.file_url@">@contents.title@</a> <if @admin_p@ eq 1><a href="@contents.properties_url@">#acs-kernel.common_Edit#</a></if><br>
+<a href="@contents.file_url@">@contents.title@</a> <if @admin_p@ true><a href="@contents.properties_url@">#acs-kernel.common_Edit#</a></if><br>
 </if>
 </multiple>
 </if></if>
Index: openacs-4/packages/file-storage/www/file.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/file.adp,v
diff -u -r1.27 -r1.27.2.1
--- openacs-4/packages/file-storage/www/file.adp	3 Jul 2015 10:47:33 -0000	1.27
+++ openacs-4/packages/file-storage/www/file.adp	18 Jan 2017 07:50:07 -0000	1.27.2.1
@@ -8,14 +8,14 @@
 
 <div class="list-button-bar-top">
   <a href="@folder_view_url@" class="button" title="#file-storage.back_to_folder_view#">#file-storage.back_to_folder_view#</a>
-  <if @show_all_versions_p@ true>
+  <if @show_all_versions_p;literal@ true>
 	<a href="@show_versions_url@" class="button" title="#file-storage.lt_show_only_live_versio#">#file-storage.lt_show_only_live_versio#</a>
   </if>
   <else>
 	<a href="@show_versions_url@" class="button" title="#file-storage.show_all_versions#">#file-storage.show_all_versions#</a>
   </else>
 </div>
-<if @categories_p@><if @category_links@><p>#file-storage.Categories#: @category_links;noquote@</p></if></if>
+<if @categories_p;literal@ true><if @category_links@><p>#file-storage.Categories#: @category_links;noquote@</p></if></if>
   <listtemplate name="version"></listtemplate>
 <if @gc_comments@ not nil>
  <p>#file-storage.lt_Comments_on_this_file#</p>
Index: openacs-4/packages/file-storage/www/folder-chunk.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/folder-chunk.adp,v
diff -u -r1.32 -r1.32.6.1
--- openacs-4/packages/file-storage/www/folder-chunk.adp	9 Jun 2009 12:37:14 -0000	1.32
+++ openacs-4/packages/file-storage/www/folder-chunk.adp	18 Jan 2017 07:50:07 -0000	1.32.6.1
@@ -1,4 +1,4 @@
-<if @categories_p@>
+<if @categories_p;literal@ true>
   <if @category_links@>
     <p>#file-storage.Categories#: @category_links;noquote@</p>
   </if>
Index: openacs-4/packages/file-storage/www/folder-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/folder-delete.adp,v
diff -u -r1.9 -r1.9.2.1
--- openacs-4/packages/file-storage/www/folder-delete.adp	3 Jul 2015 10:47:34 -0000	1.9
+++ openacs-4/packages/file-storage/www/folder-delete.adp	18 Jan 2017 07:50:07 -0000	1.9.2.1
@@ -2,7 +2,7 @@
 <property name="doc(title)">@page_title;literal@</property>
 <property name="context">@context;literal@</property>
 
-<if @blocked_p@ eq "t">
+<if @blocked_p;literal@ true">
 
 <p>#file-storage.lt_This_folder_contains_#
 
Index: openacs-4/packages/file-storage/www/simple.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/simple.adp,v
diff -u -r1.4 -r1.4.2.1
--- openacs-4/packages/file-storage/www/simple.adp	3 Jul 2015 10:47:34 -0000	1.4
+++ openacs-4/packages/file-storage/www/simple.adp	18 Jan 2017 07:50:07 -0000	1.4.2.1
@@ -6,8 +6,8 @@
 
 <p><a href="@url@">@url@</a></p>
 <p>@description@</p>
-<if @categories_p@><if @category_links@><p>#file-storage.Categories#: @category_links;noquote@</p></if></if>
-<if @edit_p@ true>
+<if @categories_p;literal@ true><if @category_links@><p>#file-storage.Categories#: @category_links;noquote@</p></if></if>
+<if @edit_p;literal@ true>
 <p><a href="simple-edit?object_id=@object_id@" class="button">#acs-kernel.common_edit#</a>
 <a href="simple-delete?object_id=@object_id@&amp;folder_id=@folder_id@" class="button">#acs-kernel.common_delete#</a>
 </p>