Index: openacs-4/packages/notifications/notifications.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/notifications.info,v
diff -u -r1.61.2.2 -r1.61.2.3
--- openacs-4/packages/notifications/notifications.info	18 May 2020 21:13:20 -0000	1.61.2.2
+++ openacs-4/packages/notifications/notifications.info	6 Nov 2020 15:51:01 -0000	1.61.2.3
@@ -8,7 +8,7 @@
     <singleton-p>t</singleton-p>
     <auto-mount>notifications</auto-mount>
 
-    <version name="5.10.0d6" url="http://openacs.org/repository/download/apm/notifications-5.10.0d6.apm">
+    <version name="5.10.0d7" url="http://openacs.org/repository/download/apm/notifications-5.10.0d7.apm">
         <owner url="http://openacs.org">OpenACS</owner>
         <summary>Email notifications management</summary>
         <release-date>2019-01-16</release-date>
@@ -17,7 +17,7 @@
         <maturity>3</maturity>
         <package_instance_name>#notifications.Notifications#</package_instance_name>
 
-        <provides url="notifications" version="5.10.0d6"/>
+        <provides url="notifications" version="5.10.0d7"/>
         <requires url="acs-kernel" version="5.9.1"/>
         <requires url="acs-tcl" version="5.10.0d34"/>
         <requires url="acs-mail-lite" version="5.9.1"/>
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/notifications/sql/postgresql/upgrade/upgrade-5.10.0d6-5.10.0d7.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/notifications/tcl/sweep-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/tcl/sweep-procs.tcl,v
diff -u -r1.28.2.1 -r1.28.2.2
--- openacs-4/packages/notifications/tcl/sweep-procs.tcl	15 Mar 2019 16:48:50 -0000	1.28.2.1
+++ openacs-4/packages/notifications/tcl/sweep-procs.tcl	6 Nov 2020 15:51:01 -0000	1.28.2.2
@@ -13,15 +13,23 @@
     ad_proc -public cleanup_notifications {} {
         Clean up the notifications that have been sent out (DRB: inefficiently...).
     } {
-        # LARS:
-        # Also sweep the dynamic notification requests that have been sent out
-        db_dml delete_dynamic_requests {}
-
         # before the killing starts, remove invalid requests
         foreach request_id [db_list select_invalid_request_ids {
            select request_id
              from notification_requests
-            where not acs_permission.permission_p(object_id, user_id, 'read')
+            where
+                  -- LARS:
+                  -- Also sweep the dynamic notification requests that have been sent out
+                  (dynamic_p = 't' and
+                   exists (select 1
+                           from    notifications n,
+                                   notification_user_map num
+                           where   n.type_id = type_id
+                           and     n.object_id = object_id
+                           and     num.notification_id = n.notification_id
+                           and     num.user_id = user_id))
+
+               or not acs_permission.permission_p(object_id, user_id, 'read')
         }] {
             notification::request::delete -request_id $request_id
         }
Index: openacs-4/packages/notifications/tcl/sweep-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/tcl/sweep-procs.xql,v
diff -u -r1.5 -r1.5.2.1
--- openacs-4/packages/notifications/tcl/sweep-procs.xql	15 Nov 2017 10:40:28 -0000	1.5
+++ openacs-4/packages/notifications/tcl/sweep-procs.xql	6 Nov 2020 15:51:01 -0000	1.5.2.1
@@ -16,19 +16,4 @@
         </querytext>
     </fullquery>
 
-    <fullquery name="notification::sweep::cleanup_notifications.delete_dynamic_requests">
-        <querytext>
-           delete from notification_requests
-           where  dynamic_p = 't'
-           and    exists (select 1 
-                          from    notifications n, 
-                                  notification_user_map num
-                          where   n.type_id = type_id
-                          and     n.object_id = object_id
-                          and     num.notification_id = n.notification_id
-                          and     num.user_id = user_id)
-        </querytext>
-    </fullquery>
-
-
 </queryset>