Index: openacs-4/packages/forums/lib/message/threads-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/threads-chunk.tcl,v
diff -u -N -r1.16.2.1 -r1.16.2.2
--- openacs-4/packages/forums/lib/message/threads-chunk.tcl	12 Sep 2015 11:06:24 -0000	1.16.2.1
+++ openacs-4/packages/forums/lib/message/threads-chunk.tcl	6 Nov 2016 15:22:20 -0000	1.16.2.2
@@ -1,13 +1,17 @@
-ad_page_contract {
+ad_include_contract {
     one forum view
 
     @author Ben Adida (ben@openforce.net)
     @creation-date 2002-05-24
     @cvs-id $Id$
+} {
+    forum_id:naturalnum,notnull
+    {orderby:token,notnull "last_child_post,desc"}
+    {flush_p:boolean,notnull 0}
+    {page_size:naturalnum,notnull 30}
+    {base_url ""}
 }
 
-if {![info exists flush_p]} {set flush_p 0}
-
 set user_id [ad_conn user_id]
 # Get forum data
 
@@ -21,9 +25,6 @@
     set unread_or_new_query_clause [db_map new_query]
     set unread_join ""
 }
-if {![info exists base_url]} {
-    set base_url ""
-}
 
 if {$moderate_p} {
     set replies reply_count
@@ -33,14 +34,6 @@
 
 set actions [list]
 
-if {![info exists page_size] || $page_size eq ""} {
-    set page_size 30
-}
-
-if {![info exists base_url] || $base_url eq ""} {
-    set base_url ""
-}
-
 # new postings are allowed if
 # 0. The user has post-permissions
 # 1. Users can create new threads AND the posting policy is open or
@@ -78,6 +71,7 @@
     -name messages \
     -multirow messages \
     -page_size $page_size \
+    -page_size_variable_p 1 \
     -page_flush_p $flush_p \
     -page_query_name messages_select_paginate \
     -pass_properties {moderate_p useReadingInfo} \
Index: openacs-4/packages/forums/www/forum-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/forum-view.adp,v
diff -u -N -r1.40.2.2 -r1.40.2.3
--- openacs-4/packages/forums/www/forum-view.adp	10 Oct 2015 12:13:54 -0000	1.40.2.2
+++ openacs-4/packages/forums/www/forum-view.adp	6 Nov 2016 15:22:20 -0000	1.40.2.3
@@ -21,4 +21,5 @@
 	 moderate_p="@permissions.moderate_p;literal@"
 	 &="orderby"
 	 &="page"
+ 	 &="page_size"
 	 admin_p="@permissions.admin_p;literal@" >
Index: openacs-4/packages/forums/www/forum-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/forum-view.tcl,v
diff -u -N -r1.35.2.3 -r1.35.2.4
--- openacs-4/packages/forums/www/forum-view.tcl	28 May 2016 09:27:05 -0000	1.35.2.3
+++ openacs-4/packages/forums/www/forum-view.tcl	6 Nov 2016 15:22:20 -0000	1.35.2.4
@@ -11,6 +11,7 @@
     {orderby:token,notnull "last_child_post,desc"}
     {flush_p:boolean,notnull 0}
     page:naturalnum,optional,notnull
+    page_size:naturalnum,optional,notnull
 }