Index: openacs-4/packages/acs-templating/tcl/tag-init.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/tag-init.tcl,v
diff -u -r1.39.2.8 -r1.39.2.9
--- openacs-4/packages/acs-templating/tcl/tag-init.tcl	18 Sep 2015 10:23:46 -0000	1.39.2.8
+++ openacs-4/packages/acs-templating/tcl/tag-init.tcl	10 Oct 2015 12:26:15 -0000	1.39.2.9
@@ -33,14 +33,19 @@
 
 template_tag property { chunk params } {
 
-  set name [ns_set iget $params name]
+    set name [ns_set iget $params name]
+    set adp  [ns_set iget $params adp 0]
 
-  # quote dollar signs, square bracket and quotes
-  regsub -all {[\]\[\"\\$]} $chunk {\\&} quoted_chunk
-  regsub -all {<tcl>} $quoted_chunk {<%} quoted_chunk
-  regsub -all {</tcl>} $quoted_chunk {%>} quoted_chunk
+    # quote dollar signs, square bracket and quotes
+    regsub -all {[\]\[\"\\$]} $chunk {\\&} quoted_chunk
+    if {$adp} {
+        regsub -all {<tcl>} $quoted_chunk {<%} quoted_chunk
+        regsub -all {</tcl>} $quoted_chunk {%>} quoted_chunk
 
-  template::adp_append_code "set __adp_properties($name) \[ns_adp_parse -string \"$quoted_chunk\"\]"
+        template::adp_append_code "set __adp_properties($name) \[ns_adp_parse -string \"$quoted_chunk\"\]"
+    } else {
+        template::adp_append_code "set __adp_properties($name) \"$quoted_chunk\""
+    }
 }
 
 # Set the master template.