Index: openacs-4/packages/forums/lib/message/choose-message-move.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/choose-message-move.tcl,v diff -u -r1.1.16.1 -r1.1.16.2 --- openacs-4/packages/forums/lib/message/choose-message-move.tcl 12 Sep 2015 11:06:22 -0000 1.1.16.1 +++ openacs-4/packages/forums/lib/message/choose-message-move.tcl 2 Jan 2016 19:20:42 -0000 1.1.16.2 @@ -34,9 +34,9 @@ } } -db_0or1row get_tree_sortkey { } +db_0or1row get_tree_sortkey {} -db_foreach get_parent_id { } { +db_foreach get_parent_id {} { db_multirow messages get_messages " select message_id, subject from forums_messages where forum_id = $message(forum_id) and message_id <> $message(message_id) and parent_id is null and message_id <> :parent_id " Index: openacs-4/packages/forums/lib/message/choose_message_move.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/choose_message_move.tcl,v diff -u -r1.3.10.1 -r1.3.10.2 --- openacs-4/packages/forums/lib/message/choose_message_move.tcl 12 Sep 2015 11:06:23 -0000 1.3.10.1 +++ openacs-4/packages/forums/lib/message/choose_message_move.tcl 2 Jan 2016 19:20:42 -0000 1.3.10.2 @@ -34,9 +34,9 @@ } } -db_0or1row get_tree_sortkey { } +db_0or1row get_tree_sortkey {} -db_foreach get_parent_id { } { +db_foreach get_parent_id {} { db_multirow messages get_messages " select message_id, subject from forums_messages where forum_id = $message(forum_id) and message_id <> $message(message_id) and parent_id is null and message_id <> :parent_id " Index: openacs-4/packages/forums/lib/message/post.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/Attic/post.xql,v diff -u -r1.1 -r1.1.18.1 --- openacs-4/packages/forums/lib/message/post.xql 17 Dec 2003 15:45:29 -0000 1.1 +++ openacs-4/packages/forums/lib/message/post.xql 2 Jan 2016 19:20:42 -0000 1.1.18.1 @@ -10,12 +10,4 @@ - - - select forum_id - from forums_messages - where message_id = :parent_id - - - Index: openacs-4/packages/forums/lib/user/post-history-chunk.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/user/post-history-chunk.xql,v diff -u -r1.5 -r1.5.2.1 --- openacs-4/packages/forums/lib/user/post-history-chunk.xql 27 Oct 2014 16:41:37 -0000 1.5 +++ openacs-4/packages/forums/lib/user/post-history-chunk.xql 2 Jan 2016 19:20:42 -0000 1.5.2.1 @@ -46,22 +46,5 @@ - - - select forums_messages.message_id, - forums_messages.subject, - to_char(forums_messages.posting_date, 'YYYY-MM-DD HH24:MI:SS') as posting_date_ansi, - forums_forums.forum_id, - forums_forums.name as forum_name - from forums_messages, - forums_forums - where forums_messages.user_id = :user_id - [template::list::filter_where_clauses -and -name messages] - forums_messages.forum_id = forums_forums.forum_id - and forums_forums.package_id = :package_id - order by forums_messages.posting_date desc - - - Index: openacs-4/packages/forums/tcl/forums-callback-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/tcl/forums-callback-procs.tcl,v diff -u -r1.9.2.1 -r1.9.2.2 --- openacs-4/packages/forums/tcl/forums-callback-procs.tcl 12 Sep 2015 11:06:25 -0000 1.9.2.1 +++ openacs-4/packages/forums/tcl/forums-callback-procs.tcl 2 Jan 2016 19:20:42 -0000 1.9.2.2 @@ -318,11 +318,11 @@ ns_log Notice $msg set result [list $msg] - set last_poster [db_list_of_lists sel_poster {*SQL*} ] + set last_poster [db_list_of_lists sel_poster {} ] set msg "Last Poster of $last_poster" lappend result $msg - set poster [db_list_of_lists sel_user_id {*SQL*} ] + set poster [db_list_of_lists sel_user_id {} ] set msg "Poster of $poster" lappend result $msg @@ -343,8 +343,8 @@ ns_log Notice $msg set result [list $msg] - db_dml upd_poster { *SQL* } - db_dml upd_user_id { *SQL* } + db_dml upd_poster {} + db_dml upd_user_id {} lappend result "Merge of forums is done" Index: openacs-4/packages/forums/tcl/forums-sc-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/tcl/forums-sc-procs-postgresql.xql,v diff -u -r1.3 -r1.3.14.1 --- openacs-4/packages/forums/tcl/forums-sc-procs-postgresql.xql 12 Jul 2004 14:50:00 -0000 1.3 +++ openacs-4/packages/forums/tcl/forums-sc-procs-postgresql.xql 2 Jan 2016 19:20:42 -0000 1.3.14.1 @@ -3,16 +3,6 @@ postgresql7.1 - - - select site_node__url(node_id) - from site_nodes - where object_id = (select package_id - from forums_forums - where forums_forums.forum_id = :forum_id) - - - select site_node__url(min(node_id)) Index: openacs-4/packages/forums/tcl/messages-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/tcl/messages-procs.tcl,v diff -u -r1.46.2.1 -r1.46.2.2 --- openacs-4/packages/forums/tcl/messages-procs.tcl 12 Sep 2015 11:06:26 -0000 1.46.2.1 +++ openacs-4/packages/forums/tcl/messages-procs.tcl 2 Jan 2016 19:20:42 -0000 1.46.2.2 @@ -60,7 +60,7 @@ if {$original_message_id ne ""} { # The was a non-null message_id arguement - if {[db_string message_exists_p { *SQL* }]} { + if {[db_string message_exists_p {}]} { return $message_id } else { # OK - it wasn't a simple double-click, so bomb