Fisheye: Tag 1.1.20.1 refers to a dead (removed) revision in file `openacs-4/packages/categories/www/cadmin/category-link-delete-2-oracle.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.20.1 refers to a dead (removed) revision in file `openacs-4/packages/categories/www/cadmin/category-link-delete-2-postgresql.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/categories/www/cadmin/category-link-delete-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-link-delete-2.tcl,v
diff -u -r1.9 -r1.9.2.1
--- openacs-4/packages/categories/www/cadmin/category-link-delete-2.tcl	29 Jun 2018 17:27:18 -0000	1.9
+++ openacs-4/packages/categories/www/cadmin/category-link-delete-2.tcl	15 Mar 2019 13:26:08 -0000	1.9.2.1
@@ -17,7 +17,16 @@
 permission::require_permission -object_id $tree_id -privilege category_tree_write
 
 db_transaction {
-    foreach link_id [db_list check_category_link_permissions ""] {
+    foreach link_id [db_list check_category_link_permissions [subst {
+        select l.link_id
+        from category_links l, categories c
+        where l.link_id in ([join $link_id ,])
+        and acs_permission.permission_p(c.tree_id,:user_id,'category_tree_write') = 't'
+        and ((l.from_category_id = :category_id
+              and l.to_category_id = c.category_id)
+             or (l.from_category_id = c.category_id
+                 and l.to_category_id = :category_id))
+    }]] {
 	category_link::delete $link_id
     }
 } on_error {
Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `openacs-4/packages/categories/tcl/tagcloud-procs-oracle.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `openacs-4/packages/categories/tcl/tagcloud-procs-postgresql.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/categories/tcl/tagcloud-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/tcl/tagcloud-procs.tcl,v
diff -u -r1.8 -r1.8.2.1
--- openacs-4/packages/categories/tcl/tagcloud-procs.tcl	1 Nov 2018 08:50:20 -0000	1.8
+++ openacs-4/packages/categories/tcl/tagcloud-procs.tcl	15 Mar 2019 13:28:50 -0000	1.8.2.1
@@ -104,7 +104,17 @@
     # so we should check for the reader's locale and use that
     # or the default_locale, but ...
 
-    set tag_list [db_list_of_lists tagcloud_get_keys {}]
+    set tag_list [db_list_of_lists tagcloud_get_keys {
+        select category_id, count(com.object_id), min(trans.name)
+           from categories
+	   natural left join category_object_map com
+	   natural join category_trees
+           natural join category_translations trans
+        where tree_id = :tree_id
+	  and trans.locale = :default_locale
+          and acs_permission.permission_p(com.object_id, :user_id, 'read')
+        group by category_id
+    }]
 }
 
 
Fisheye: Tag 1.1.20.1 refers to a dead (removed) revision in file `openacs-4/packages/categories/www/cadmin/category-link-delete-oracle.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.20.1 refers to a dead (removed) revision in file `openacs-4/packages/categories/www/cadmin/category-link-delete-postgresql.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/categories/www/cadmin/category-link-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-link-delete.tcl,v
diff -u -r1.9 -r1.9.2.1
--- openacs-4/packages/categories/www/cadmin/category-link-delete.tcl	29 Jun 2018 17:27:18 -0000	1.9
+++ openacs-4/packages/categories/www/cadmin/category-link-delete.tcl	15 Mar 2019 13:31:27 -0000	1.9.2.1
@@ -37,7 +37,18 @@
 
 multirow create category_links linked_category_id linked_tree_id direction
 
-db_foreach check_category_links "" {
+db_foreach check_category_links [subst {
+    select c.category_id as linked_category_id, c.tree_id as linked_tree_id,
+           (case when l.from_category_id = :category_id then 'f' else 'r' end) as direction,
+           acs_permission.permission_p(c.tree_id,:user_id,'category_tree_write') as write_p,
+           l.link_id
+    from category_links l, categories c
+    where l.link_id in ([join $link_id ,])
+    and ((l.from_category_id = :category_id
+	  and l.to_category_id = c.category_id)
+	 or (l.from_category_id = c.category_id
+	     and l.to_category_id = :category_id))
+}] {
     if {$write_p == "t"} {
 	multirow append category_links $linked_category_id $linked_tree_id $direction
 	lappend allowed_link_ids $link_id