Index: openacs-4/packages/acs-templating/tcl/parse-procs-aolserver.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/Attic/parse-procs-aolserver.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-templating/tcl/parse-procs-aolserver.tcl	7 Apr 2022 12:39:28 -0000	1.1.2.1
@@ -0,0 +1,20 @@
+ad_library {
+    ADP to Tcl Compiler, AOLServer variant
+}
+
+#
+# AOLserver does not support the double dashes "--" to separate non
+# positional arguments from positional ones
+#
+ad_proc template::adp_parse_string { chunk } {
+    Parse string as ADP
+} {
+    return [ns_adp_parse -string $chunk]
+}
+
+#
+# Local variables:
+#    mode: tcl
+#    tcl-indent-level: 4
+#    indent-tabs-mode: nil
+# End:
Index: openacs-4/packages/acs-templating/tcl/parse-procs-naviserver.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/Attic/parse-procs-naviserver.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-templating/tcl/parse-procs-naviserver.tcl	7 Apr 2022 12:39:28 -0000	1.1.2.1
@@ -0,0 +1,20 @@
+ad_library {
+    ADP to Tcl Compiler, NaviServer variant.
+}
+
+#
+# NaviServer requires for disambiguation of flags and values at the
+# end of the argument processing a terminating "--"
+#
+ad_proc template::adp_parse_string { chunk } {
+    Parse string as ADP
+} {
+    return [ns_adp_parse -string -- $chunk]
+}
+
+#
+# Local variables:
+#    mode: tcl
+#    tcl-indent-level: 4
+#    indent-tabs-mode: nil
+# End:
Index: openacs-4/packages/acs-templating/tcl/parse-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/parse-procs.tcl,v
diff -u -N -r1.65.2.13 -r1.65.2.14
--- openacs-4/packages/acs-templating/tcl/parse-procs.tcl	30 Jan 2022 14:38:58 -0000	1.65.2.13
+++ openacs-4/packages/acs-templating/tcl/parse-procs.tcl	7 Apr 2022 12:39:28 -0000	1.65.2.14
@@ -501,7 +501,10 @@
     return $formatted_message
 }
 
-ad_proc -public template::adp_compile { {-file ""} {-string ""} } {
+ad_proc -public template::adp_compile {
+    {-file ""}
+    {-string ""}
+} {
     Converts an ADP template into a chunk of Tcl code.  Caching this code
     avoids the need to reparse the ADP template with each request.
 
@@ -673,15 +676,6 @@
     return {(^|[^\\])@([[:alnum:]_:]+);noi18n@}
 }
 
-# NaviServer requires for disambiguation of flags and values at the
-# end of the argument processing a terminating "--" (like for other
-# commands). AOLserver does not allow the "--".
-if {[ns_info name] eq "NaviServer"} {
-    ad_proc template::adp_parse_string { chunk } {Parse string as ADP} {ns_adp_parse -string -- $chunk}
-} else {
-    ad_proc template::adp_parse_string { chunk } {Parse string as ADP} {ns_adp_parse -string $chunk}
-}
-
 ad_proc -private template::adp_compile_chunk { chunk } {
     Parses a single chunk of a template.  A chunk is either the entire
     template or the portion of a template contained within a balanced