Index: openacs-4/packages/acs-admin/www/apm/version-reload.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-reload.tcl,v
diff -u -r1.16.2.1 -r1.16.2.2
--- openacs-4/packages/acs-admin/www/apm/version-reload.tcl	13 Mar 2019 09:18:08 -0000	1.16.2.1
+++ openacs-4/packages/acs-admin/www/apm/version-reload.tcl	2 Aug 2021 17:38:40 -0000	1.16.2.2
@@ -6,7 +6,7 @@
     @creation-date 9 May 2000
     @cvs-id $Id$
 } {
-    {version_id:naturalnum,notnull}
+    {version_id:naturalnum,object_id,notnull}
     {return_url:localurl "index"}
 }
 
Index: openacs-4/packages/acs-tcl/tcl/tcl-documentation-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/tcl-documentation-procs.tcl,v
diff -u -r1.61.2.15 -r1.61.2.16
--- openacs-4/packages/acs-tcl/tcl/tcl-documentation-procs.tcl	24 Jun 2021 11:36:35 -0000	1.61.2.15
+++ openacs-4/packages/acs-tcl/tcl/tcl-documentation-procs.tcl	2 Aug 2021 17:38:40 -0000	1.61.2.16
@@ -635,6 +635,21 @@
 
         # find parameterized flags
         foreach flag $pre_flag_list {
+
+            #
+            # The following statement is transitional code, and should
+            # help in the upgrading phase, when newer page_contracts
+            # with "object_id" are processed, but the
+            # page_contract_filter_proc is not yet defined.
+            #
+            if {$flag eq "object_id"
+                && [info commands ad_page_contract_filter_proc_object_id] eq ""
+            } {
+                # fall back to "integer"
+                set flag integer
+                ns_log notice "Warning: page contract contains 'object_id', but filter proc is not available"
+            }
+
             set left_paren [string first "(" $flag]
             if { $left_paren == -1 } {
                 lappend flag_list $flag
@@ -1688,7 +1703,7 @@
 }
 
 ad_page_contract_filter object_id { name value } {
-    
+
     Checks whether the value is a valid object_id, i.e. in the range
     defined for the SQL datatype "integer", which is the same for
     Oracle and PostgreSQL. In case, object_types are altered in future
@@ -1697,10 +1712,10 @@
 
     The function is essentially the same as ad_page_contract_filter
     "integer", but with the additional value range check.
-    
+
     @author Gustaf Neumann
     @creation-date May 23, 2021
-    
+
 } {
     if { [regexp {^(-)?(\d+)$} $value _ sign rest] } {
         set value $sign[util::trim_leading_zeros $rest]
@@ -2201,7 +2216,7 @@
 }
 
 ad_page_contract_filter printable { name value } {
-    
+
     Checks whether the value contains only characters with a printable
     representation. This represents character class of the Tcl
     character class "print", which consists of the characters with a