Index: openacs-4/packages/survey/lib/portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/lib/portlet.adp,v
diff -u -r1.1 -r1.1.16.1
--- openacs-4/packages/survey/lib/portlet.adp	21 Jan 2005 17:24:28 -0000	1.1
+++ openacs-4/packages/survey/lib/portlet.adp	26 Jun 2022 13:01:19 -0000	1.1.16.1
@@ -1,7 +1,7 @@
 <if @display_empty_p@ true or @active:rowcount@ gt 0>
 <div<if @id@ not nil> id="@id@"</if><if @class@ not nil> class="@class@"</if>>
 <h4><a href="@base_url@">@package_name@</a></h4>
-<if @active:rowcount@ eq 0><em>None active</em></if><else>
+<if @active:rowcount;literal@ eq 0><em>None active</em></if><else>
 <ul>
 <multiple name="active">
   <li><a href="@active.url@">@active.name@</a>
Index: openacs-4/packages/survey/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/index.adp,v
diff -u -r1.10 -r1.10.2.1
--- openacs-4/packages/survey/www/index.adp	7 Aug 2017 23:48:29 -0000	1.10
+++ openacs-4/packages/survey/www/index.adp	26 Jun 2022 13:01:20 -0000	1.10.2.1
@@ -33,7 +33,7 @@
         </li>
       </multiple>
       
-      <if @surveys:rowcount@ eq 0>
+      <if @surveys:rowcount;literal@ eq 0>
         <li>#survey.No_surveys_active#</li>
       </if>
     </ul>
Index: openacs-4/packages/survey/www/admin/one-respondent.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/one-respondent.adp,v
diff -u -r1.10.2.1 -r1.10.2.2
--- openacs-4/packages/survey/www/admin/one-respondent.adp	27 Apr 2022 16:17:47 -0000	1.10.2.1
+++ openacs-4/packages/survey/www/admin/one-respondent.adp	26 Jun 2022 13:01:20 -0000	1.10.2.2
@@ -3,7 +3,7 @@
 <property name="survey_id">@survey_id;literal@</property>
 
 <property name="survey_id">@survey_id;literal@</property>
-<property name="survey_name@">;noquote@survey_info.name@</property>
+<property name="survey_name">@survey_info.name;literal@</property>
 <property name="title">#survey.lt_One_Respondent_first_#</property>
 <property name="context">@context;literal@</property>
 <table class="table-display" cellspacing="0" cellpadding="5">
@@ -25,8 +25,7 @@
 <if @responses.original_p;literal@ true><a href="response-delete?response_id=@response_id@">
 <img src="../graphics/delete.gif" style="float:right; vertical-align:top; border: 0;" alt="#survey.Delete#"></a>
 </if>
- <strong>[<if
-      @responses.original_p@>#survey.Original#</if><else>#survey.Edited#</a></else>
+ <strong>[<if @responses.original_p;literal@ true>#survey.Original#</if><else>#survey.Edited#</a></else>
       #survey.lt_Response_on_responses#</strong> 
 	  <br>
 @responses.response_display;noquote@
Index: openacs-4/packages/survey/www/admin/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/one.adp,v
diff -u -r1.14.2.1 -r1.14.2.2
--- openacs-4/packages/survey/www/admin/one.adp	27 Apr 2022 16:17:47 -0000	1.14.2.1
+++ openacs-4/packages/survey/www/admin/one.adp	26 Jun 2022 13:01:20 -0000	1.14.2.2
@@ -30,8 +30,7 @@
 	
       
 	<tr class="odd"><td><if @survey_info.editable_p;literal@ true> #survey.lt_Users_may_edit_their_#</if><else>#survey.lt_Users_may_not_edit_th#</else> - [ <a
-	href="response-editable-toggle?survey_id=@survey_id@">#survey.make# <if
-	@survey_info.editable_p@>#survey.non-#</if>#survey.editable#</a> ]</td></tr>
+	href="response-editable-toggle?survey_id=@survey_id@">#survey.make# <if	@survey_info.editable_p;literal@ true>#survey.non-#</if>#survey.editable#</a> ]</td></tr>
 
       <tr class="odd">
         <td>#survey.Display_Options# </td>
@@ -61,7 +60,7 @@
 
 <h3>#survey.Questions#</h3>
 <table cellspacing="0">
-<if @questions:rowcount@ eq 0>
+<if @questions:rowcount;literal@ eq 0>
     <tr class="odd">
   </else>
 <td></td><td><a href="question-add?section_id=@survey_info.section_id@">#survey.add_new_question#</a></tr></tr>
Index: openacs-4/packages/survey/www/admin/site-wide-survey.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/site-wide-survey.adp,v
diff -u -r1.1 -r1.1.26.1
--- openacs-4/packages/survey/www/admin/site-wide-survey.adp	16 Sep 2002 00:00:24 -0000	1.1
+++ openacs-4/packages/survey/www/admin/site-wide-survey.adp	26 Jun 2022 13:01:20 -0000	1.1.26.1
@@ -1,6 +1,6 @@
 <master>
 
-<if @surveys:rowcount@ gt 0>
+<if @surveys:rowcount;literal@ gt 0>
 	<multiple name="surveys">
 @surveys.parent_name@
 <ul>
Index: openacs-4/packages/survey/www/admin/view-text-responses.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/view-text-responses.adp,v
diff -u -r1.7.10.1 -r1.7.10.2
--- openacs-4/packages/survey/www/admin/view-text-responses.adp	27 Apr 2022 16:17:47 -0000	1.7.10.1
+++ openacs-4/packages/survey/www/admin/view-text-responses.adp	26 Jun 2022 13:01:20 -0000	1.7.10.2
@@ -6,7 +6,7 @@
 <property name="context">@context;literal@</property>
 @question_text@ 
 <hr>
-<if @responses:rowcount@ eq 0>
+<if @responses:rowcount;literal@ eq 0>
 	<em>#survey.No_Responses#</em>
 	</if>
       <multiple name="responses">