Index: openacs-4/packages/forums/tcl/forums-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/tcl/forums-procs.tcl,v
diff -u -N -r1.30 -r1.31
--- openacs-4/packages/forums/tcl/forums-procs.tcl	16 Nov 2017 12:40:08 -0000	1.30
+++ openacs-4/packages/forums/tcl/forums-procs.tcl	11 Jun 2018 14:04:10 -0000	1.31
@@ -45,6 +45,9 @@
         callback forum::forum_new -package_id $package_id -forum_id $forum_id
     }
 
+    forum::flush_templating_cache \
+        -forum_id $forum_id    
+
     return $forum_id
 }
 
@@ -76,13 +79,17 @@
     if {!$no_callback_p} {
         callback forum::forum_edit -package_id [ad_conn package_id] -forum_id $forum_id
     }
+
+    forum::flush_templating_cache \
+        -forum_id $forum_id
 }
 
 ad_proc -public forum::attachments_enabled_p {} {
     if {"forums" eq [ad_conn package_key]} { 
-      set return_value [site_node_apm_integration::child_package_exists_p -package_id [ad_conn package_id] -package_key attachments]
-    } else { 
-      set return_value 0
+        set return_value [site_node_apm_integration::child_package_exists_p \
+                              -package_id [ad_conn package_id] -package_key attachments]
+    } else {
+        set return_value 0
     }
     return $return_value
 }
@@ -118,6 +125,16 @@
     }
 }
 
+ad_proc -public forum::flush_templating_cache {
+    {-forum_id:required}
+} {
+    Flushes forum templating cache, created by template::paginator
+} {
+    # DRB: Black magic cache flush call which will disappear when list builder is
+    # rewritten to paginate internally rather than use the template paginator.
+    cache flush "messages,forum_id=$forum_id*"
+}
+
 ad_proc -deprecated -public forum::posting_policy_set {
     {-posting_policy:required}
     {-forum_id:required}