Index: openacs-4/packages/acs-tcl/tcl/request-processor-init.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/request-processor-init.tcl,v
diff -u -r1.17.2.2 -r1.17.2.3
--- openacs-4/packages/acs-tcl/tcl/request-processor-init.tcl	10 Sep 2015 08:21:59 -0000	1.17.2.2
+++ openacs-4/packages/acs-tcl/tcl/request-processor-init.tcl	5 Nov 2016 17:27:14 -0000	1.17.2.3
@@ -74,12 +74,14 @@
 }
 
 # Unregister any GET/HEAD/POST handlers for /*.tcl (since they
-# interfere with the abstract URL system). AOLserver automatically
-# registers these in file.tcl if EnableTclPages=On.
+# interfere with the abstract URL system of OpenACS). AOLserver/
+# NaviServer automatically register these when EnableTclPages is
+# configured as true.
 
-ns_unregister_proc GET /*.tcl
-ns_unregister_proc HEAD /*.tcl
-ns_unregister_proc POST /*.tcl
+set unreg_cmd [expr {$::acs::useNaviServer ? "ns_unregister_op" : "ns_unregister_proc"}]
+$unreg_cmd GET /*.tcl
+$unreg_cmd HEAD /*.tcl
+$unreg_cmd POST /*.tcl
 
 set listings [ns_config "ns/server/[ns_info server]" "directorylisting" "none"]
 if { $listings eq "fancy" || $listings eq "simple" } {