Index: openacs-4/packages/assessment/lib/session-items.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/session-items.adp,v
diff -u -r1.22 -r1.23
--- openacs-4/packages/assessment/lib/session-items.adp	7 Aug 2017 23:48:03 -0000	1.22
+++ openacs-4/packages/assessment/lib/session-items.adp	22 May 2018 15:13:22 -0000	1.23
@@ -5,7 +5,7 @@
 
     <multiple name="items">
 <if @admin_p;literal@ true><p><a href="@items.item_edit_general_url@">Edit this question</a></p></if>
-<if @feedback_only_p@ eq 0 or @items.has_feedback_p@ eq 1>
+<if @feedback_only_p;literal@ eq 0 or @items.has_feedback_p;literal@ eq 1>
      <if @show_item_name_p;literal@ true><p style="font-weight:bold;">@items.name@:</p></if>
       <if @survey_p@ ne t and @items.as_item_id@ ne @items.next_as_item_id@>
 	<if @items.max_time_to_complete@ not nil> (#assessment.max_time# @items.max_time_to_complete@) </if>
@@ -32,17 +32,17 @@
 			<if @items.answered_p;literal@ true><p style="font-weight:bold;">#assessment.not_yet_reviewed#</p> </if>
 			<else><p style="font-weight:bold;">#assessment.not_answered#</p></else>
 		      </else>
-		      <if @edit_p@ eq 1 and @items.answered_p@ eq t><a href="@items.results_edit_url@">#assessment.Edit#</a></if>
+		      <if @edit_p;literal@ eq 1 and @items.answered_p;literal@ eq t><a href="@items.results_edit_url@">#assessment.Edit#</a></if>
 		      <include src="/packages/assessment/lib/results-messages" session_id="@session_id;literal@" section_id="@section_id;literal@" as_item_id="@items.as_item_id;literal@">
 		    </if>
 		    <else>
 		      <if @items.answered_p;literal@ true><p style="font-weight:bold">#assessment.not_yet_reviewed#</p> </if>
 		      <else><p style="font-weight:bold">#assessment.not_answered#</p> </else>
 		    </else>
-		    <if @edit_p@ eq 1 and @items.answered_p@ eq t>
+		    <if @edit_p;literal@ eq 1 and @items.answered_p;literal@ eq t>
               <a href="@items.results_edit_url@">#assessment.Edit#</a>
             </if>
-		    <include src="/packages/assessment/lib/results-messages" session_id="@session_id;literal@" section_id="@section_id;literal@" as_item_id="@items.as_item_id;literal@"> 
+		    <include src="/packages/assessment/lib/results-messages" session_id="@session_id;literal@" section_id="@section_id;literal@" as_item_id="@items.as_item_id;literal@">
 		  </if>
 		</if>
 	      <if @items.presentation_type@ eq rb or @items.presentation_type@ eq cb>
@@ -64,7 +64,7 @@
         </else>
 	</if>
 	  <elseif @items.presentation_type@ eq fitb>
-	    @items.html;noquote@ 
+	    @items.html;noquote@
 	  </elseif>
 	  <elseif @items.presentation_type@ eq f>
   	    <a href="@items.view@" id="p-type-f-@items.as_item_id"><formwidget id="response_to_item.@items.as_item_id@"></a>
@@ -80,8 +80,8 @@
 	  </if>
     </group>
 
-  <include src="/packages/assessment/lib/results-messages" session_id="@session_id;literal@" section_id="@section_id;literal@" as_item_id="@items.as_item_id;literal@" &=assessment>    
-  <if @edit_p@ eq 1 and @items.answered_p@ eq t>
+  <include src="/packages/assessment/lib/results-messages" session_id="@session_id;literal@" section_id="@section_id;literal@" as_item_id="@items.as_item_id;literal@" &=assessment>
+  <if @edit_p;literal@ eq 1 and @items.answered_p;literal@ eq t>
     <p><a href="@items.results_edit_url@" class="button">#assessment.Add_Comment#</a></p>
   </if>
   <if @feedback_only_p@ ne "t" and @assessment_data.type@ ne survey and @items.result_points@ not nil and @showpoints@ true and @items.points@ gt 0>