Index: openacs-4/packages/calendar/tcl/calendar-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/calendar-procs-oracle.xql,v
diff -u -r1.7 -r1.7.10.1
--- openacs-4/packages/calendar/tcl/calendar-procs-oracle.xql	15 May 2007 20:14:21 -0000	1.7
+++ openacs-4/packages/calendar/tcl/calendar-procs-oracle.xql	18 Mar 2019 12:47:50 -0000	1.7.10.1
@@ -20,24 +20,6 @@
   </querytext>
 </fullquery>
 
-<fullquery name="calendar::calendar_list.select_calendar_list">
-  <querytext>
-    select calendar_name, 
-           calendar_id, 
-           acs_permission.permission_p(calendar_id, :user_id, 'admin') as calendar_admin_p
-    from   calendars
-    where  (private_p = 'f' and package_id = :package_id $permissions_clause) or
-           (private_p = 't' and owner_id = :user_id)
-    order  by private_p asc, upper(calendar_name)
-  </querytext>
-</fullquery>
-
-<partialquery name="calendar::calendar_list.permissions_clause">
-  <querytext>
-        and acs_permission.permission_p(calendar_id, :user_id, :privilege) = 't'
-  </querytext>
-</partialquery>
-
 <fullquery name="calendar::delete.delete_calendar">
   <querytext>
         begin
Index: openacs-4/packages/calendar/tcl/calendar-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/calendar-procs-postgresql.xql,v
diff -u -r1.9 -r1.9.10.1
--- openacs-4/packages/calendar/tcl/calendar-procs-postgresql.xql	15 May 2007 20:14:21 -0000	1.9
+++ openacs-4/packages/calendar/tcl/calendar-procs-postgresql.xql	18 Mar 2019 12:47:50 -0000	1.9.10.1
@@ -19,25 +19,7 @@
     );
   </querytext>
 </fullquery>
- 
-<fullquery name="calendar::calendar_list.select_calendar_list">
-  <querytext>
-    select calendar_name, 
-           calendar_id, 
-           acs_permission__permission_p(calendar_id, :user_id, 'calendar_admin') as calendar_admin_p
-    from   calendars
-    where  (private_p = 'f' and package_id = :package_id $permissions_clause) or 
-           (private_p = 't' and owner_id = :user_id)
-    order  by private_p asc, upper(calendar_name)
-  </querytext>
-</fullquery>
 
-<partialquery name="calendar::calendar_list.permissions_clause">
-  <querytext>
-        and acs_permission__permission_p(calendar_id, :user_id, :privilege) = 't'
-  </querytext>
-</partialquery>
-
 <fullquery name="calendar::delete.delete_calendar">
   <querytext>
         select calendar__delete(:calendar_id)
Index: openacs-4/packages/calendar/tcl/calendar-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/calendar-procs.tcl,v
diff -u -r1.39.2.1 -r1.39.2.2
--- openacs-4/packages/calendar/tcl/calendar-procs.tcl	1 Mar 2019 11:01:22 -0000	1.39.2.1
+++ openacs-4/packages/calendar/tcl/calendar-procs.tcl	18 Mar 2019 12:47:50 -0000	1.39.2.2
@@ -323,10 +323,18 @@
 
     set permissions_clause {}
     if { $privilege ne "" } {
-        set permissions_clause [db_map permissions_clause]
+        set permissions_clause {and acs_permission.permission_p(calendar_id, :user_id, :privilege)}
     }
 
-    set new_list [db_list_of_lists select_calendar_list {}]
+    set new_list [db_list_of_lists select_calendar_list [subst {
+       select calendar_name,
+              calendar_id,
+              acs_permission.permission_p(calendar_id, :user_id, 'calendar_admin') as calendar_admin_p
+       from   calendars
+       where  (private_p = 'f' and package_id = :package_id $permissions_clause) or
+              (private_p = 't' and owner_id = :user_id)
+       order  by private_p asc, upper(calendar_name)
+    }]]
 }
 
 ad_proc -public calendar::adjust_date {