Index: openacs-4/packages/acs-subsite/tcl/plsql-utility-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/plsql-utility-procs.tcl,v
diff -u -r1.9.2.3 -r1.9.2.4
--- openacs-4/packages/acs-subsite/tcl/plsql-utility-procs.tcl	1 Feb 2021 10:58:35 -0000	1.9.2.3
+++ openacs-4/packages/acs-subsite/tcl/plsql-utility-procs.tcl	6 Mar 2021 20:01:30 -0000	1.9.2.4
@@ -58,7 +58,7 @@
     }
 
 
-    ad_proc -public format_pieces {
+    ad_proc -private format_pieces {
         { -indent 6 }
         { -num_spaces 3 }
         { -delim "" }
Index: openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl,v
diff -u -r1.68.2.20 -r1.68.2.21
--- openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl	1 Feb 2021 10:58:35 -0000	1.68.2.20
+++ openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl	6 Mar 2021 20:01:30 -0000	1.68.2.21
@@ -373,7 +373,7 @@
     }]
 }
 
-ad_proc -public subsite::util::return_url_stack {
+ad_proc -private subsite::util::return_url_stack {
     return_url_list
 } {
     Given a list of return_urls, we recursively encode them into one
@@ -894,7 +894,7 @@
     }
 }
 
-ad_proc -public subsite::save_theme_parameters {
+ad_proc -private subsite::save_theme_parameters {
     -subsite_id
     -theme
     -local_p
@@ -938,7 +938,7 @@
 
 }
 
-ad_proc -public subsite::save_theme_parameters_as {
+ad_proc -private subsite::save_theme_parameters_as {
     -subsite_id
     -theme:required
     -pretty_name:required
Index: openacs-4/packages/acs-subsite/tcl/test/acs-subsite-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/test/acs-subsite-procs.tcl,v
diff -u -r1.12.2.25 -r1.12.2.26
--- openacs-4/packages/acs-subsite/tcl/test/acs-subsite-procs.tcl	1 Mar 2021 14:59:39 -0000	1.12.2.25
+++ openacs-4/packages/acs-subsite/tcl/test/acs-subsite-procs.tcl	6 Mar 2021 20:01:30 -0000	1.12.2.26
@@ -418,6 +418,7 @@
     attribute::delete
     attribute::value_add
     attribute::value_delete
+    ad_page_contract_filter_proc_attribute_dynamic_p
 
     db_column_exists
 } acs_subsite_attributes {
@@ -495,6 +496,20 @@
                and enum_value=:enum_value
         }]
         aa_true "Value added to attribute" "$value_exists_p"
+
+        dict set cases attribute_dynamic_p [list $attribute_id 1 1 0]
+        foreach filter [dict keys $cases] {
+            foreach { value result } [dict get $cases $filter] {
+                if { $result } {
+                    aa_true "'[ns_quotehtml $value]' is $filter" \
+                        [ad_page_contract_filter_invoke $filter dummy value]
+                } else {
+                    aa_false "'[ns_quotehtml $value]' is NOT $filter" \
+                        [ad_page_contract_filter_invoke $filter dummy value]
+                }
+            }
+        }
+        
         #
         # Delete value from attribute
         #