Index: openacs-4/packages/glossar-portlet/lib/glossar-portlet-list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/glossar-portlet/lib/glossar-portlet-list.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/glossar-portlet/lib/glossar-portlet-list.adp	24 Aug 2005 21:24:42 -0000	1.2
+++ openacs-4/packages/glossar-portlet/lib/glossar-portlet-list.adp	12 Jul 2018 09:01:38 -0000	1.3
@@ -1,4 +1,4 @@
-<if @no_perm_p@>
+<if @no_perm_p;literal@ true>
 <p>@no_perm@</p>
 </if>
 <else>
Index: openacs-4/packages/invoices-portlet/lib/invoice-list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices-portlet/lib/invoice-list.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/invoices-portlet/lib/invoice-list.tcl	27 Oct 2005 19:35:38 -0000	1.3
+++ openacs-4/packages/invoices-portlet/lib/invoice-list.tcl	12 Jul 2018 09:01:38 -0000	1.4
@@ -22,7 +22,7 @@
 set pm_base_url [apm_package_url_from_id [dotlrn_community::get_package_id_from_package_key -package_key "project-manager" -community_id $dotlrn_club_id]]
 
 
-# Using the the same instance of invoices
+# Using the same instance of invoices
 set package_id [apm_package_id_from_key invoices]
 
 set community_id [dotlrn_community::get_community_id]
@@ -71,7 +71,7 @@
 	    label {[_ invoices.iv_invoice_due_date]}
 	}
         action {
-	    display_template {<if @iv_invoice.cancelled_p@ eq f><a href="@iv_invoice.edit_link@">#invoices.Edit#</a>&nbsp;<a href="@iv_invoice.cancel_link@">#invoices.Cancel#</a></if><if @paid_currency@ nil>&nbsp;<a href="@iv_invoice.delete_link@">#invoices.Delete#</a></if>
+	    display_template {<if @iv_invoice.cancelled_p;literal@ false><a href="@iv_invoice.edit_link@">#invoices.Edit#</a>&nbsp;<a href="@iv_invoice.cancel_link@">#invoices.Cancel#</a></if><if @paid_currency@ nil>&nbsp;<a href="@iv_invoice.delete_link@">#invoices.Delete#</a></if>
 	    }
 	}
     } -actions $actions -sub_class narrow \
Index: openacs-4/packages/invoices-portlet/www/invoices-list-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices-portlet/www/invoices-list-portlet.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/invoices-portlet/www/invoices-list-portlet.adp	13 Apr 2006 12:55:17 -0000	1.3
+++ openacs-4/packages/invoices-portlet/www/invoices-list-portlet.adp	12 Jul 2018 09:01:38 -0000	1.4
@@ -9,7 +9,7 @@
       <td>#invoices.iv_invoice_end_date# <input type=text name="end_date" size=12 value="@end_date@" id=sel2><input type='reset' value=' ... ' onclick="return showCalendar('sel2', 'y-m-d');"></td></td>
       <td><input type=submit name="submit" value="#invoices.ok#"></td>
     </tr>
-    <if @clear_p@ eq 1>
+    <if @clear_p;literal@ true>
       <tr>
         <td><a href="@clear_link@">#invoices.clear#</a></td>
       </tr>