Index: openacs-4/packages/categories/www/cadmin/synonym-delete-2-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/synonym-delete-2-oracle.xql,v
diff -u -N
--- openacs-4/packages/categories/www/cadmin/synonym-delete-2-oracle.xql 11 Feb 2004 13:25:28 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-
-
-
- oracle8.1.6
-
-
-
-
- select s.synonym_id
- from category_synonyms s, categories c
- where s.synonym_id in ([join $synonym_id ,])
- and c.category_id = s.category_id
- and acs_permission.permission_p(c.tree_id,:user_id,'category_tree_write') = 't'
- and s.synonym_p = 't'
-
-
-
-
-
-
Index: openacs-4/packages/categories/www/cadmin/synonym-delete-2-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/synonym-delete-2-postgresql.xql,v
diff -u -N
--- openacs-4/packages/categories/www/cadmin/synonym-delete-2-postgresql.xql 11 Feb 2004 13:25:28 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-
-
-
- postgresql7.1
-
-
-
-
- select s.synonym_id
- from category_synonyms s, categories c
- where s.synonym_id in ([join $synonym_id ,])
- and c.category_id = s.category_id
- and acs_permission__permission_p(c.tree_id,:user_id,'category_tree_write') = 't'
- and s.synonym_p = 't'
-
-
-
-
-
-
Index: openacs-4/packages/categories/www/cadmin/synonym-delete-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/synonym-delete-2.tcl,v
diff -u -N -r1.7 -r1.7.2.1
--- openacs-4/packages/categories/www/cadmin/synonym-delete-2.tcl 29 Jun 2018 17:27:18 -0000 1.7
+++ openacs-4/packages/categories/www/cadmin/synonym-delete-2.tcl 15 Mar 2019 16:33:46 -0000 1.7.2.1
@@ -17,7 +17,14 @@
permission::require_permission -object_id $tree_id -privilege category_tree_write
db_transaction {
- foreach synonym_id [db_list check_synonyms_for_delete ""] {
+ foreach synonym_id [db_list check_synonyms_for_delete [subst {
+ select s.synonym_id
+ from category_synonyms s, categories c
+ where s.synonym_id in ([join $synonym_id ,])
+ and c.category_id = s.category_id
+ and acs_permission.permission_p(c.tree_id,:user_id,'category_tree_write') = 't'
+ and s.synonym_p = 't'
+ }]] {
category_synonym::delete $synonym_id
}
} on_error {
Index: openacs-4/packages/forums/lib/forums/forums-chunk-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/forums/forums-chunk-oracle.xql,v
diff -u -N
--- openacs-4/packages/forums/lib/forums/forums-chunk-oracle.xql 23 Nov 2017 12:33:11 -0000 1.6
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-
-
-
- oracle8.1.6
-
-
-
- select forums_forums_enabled.*,
- approved_thread_count as n_threads,
- to_char(last_post, 'YYYY-MM-DD HH24:MI:SS') as last_post_ansi,
- $unread_or_new_query_clause
- from forums_forums_enabled
- where forums_forums_enabled.package_id = :package_id
- and acs_permission.permission_p(forums_forums_enabled.forum_id, :user_id, 'read') = 't'
- order by forums_forums_enabled.name
-
-
-
-
Index: openacs-4/packages/forums/lib/forums/forums-chunk-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/forums/forums-chunk-postgresql.xql,v
diff -u -N
--- openacs-4/packages/forums/lib/forums/forums-chunk-postgresql.xql 23 Nov 2017 12:33:11 -0000 1.6
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-
-
-
- postgresql7.1
-
-
-
- select forums_forums_enabled.*,
- approved_thread_count as n_threads,
- to_char(last_post, 'YYYY-MM-DD HH24:MI:SS') as last_post_ansi,
- $unread_or_new_query_clause
- from forums_forums_enabled
- where forums_forums_enabled.package_id = :package_id
- and acs_permission__permission_p(forums_forums_enabled.forum_id, :user_id,'read') = 't'
- order by forums_forums_enabled.name
-
-
-
-
Index: openacs-4/packages/forums/lib/forums/forums-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/forums/forums-chunk.tcl,v
diff -u -N -r1.24 -r1.24.2.1
--- openacs-4/packages/forums/lib/forums/forums-chunk.tcl 9 May 2018 15:33:31 -0000 1.24
+++ openacs-4/packages/forums/lib/forums/forums-chunk.tcl 15 Mar 2019 16:39:30 -0000 1.24.2.1
@@ -91,7 +91,18 @@
}
}
-db_multirow -extend { forum_view_url last_modified_pretty n_threads_pretty forum_view_statistic statistic} forums select_forums {} {
+db_multirow -extend {
+ forum_view_url last_modified_pretty n_threads_pretty forum_view_statistic statistic
+} forums select_forums [subst {
+ select forums_forums_enabled.*,
+ approved_thread_count as n_threads,
+ to_char(last_post, 'YYYY-MM-DD HH24:MI:SS') as last_post_ansi,
+ $unread_or_new_query_clause
+ from forums_forums_enabled
+ where forums_forums_enabled.package_id = :package_id
+ and acs_permission.permission_p(forums_forums_enabled.forum_id, :user_id,'read') = 't'
+ order by forums_forums_enabled.name
+}] {
set last_modified_pretty [lc_time_fmt $last_post_ansi "%x %X"]
set forum_view_url [export_vars -base forum-view { forum_id }]
set n_threads_pretty [lc_numeric $n_threads]