Index: openacs-4/packages/static-pages/tcl/static-pages-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/static-pages/tcl/static-pages-procs-oracle.xql,v diff -u -r1.5 -r1.6 --- openacs-4/packages/static-pages/tcl/static-pages-procs-oracle.xql 31 Oct 2001 15:12:58 -0000 1.5 +++ openacs-4/packages/static-pages/tcl/static-pages-procs-oracle.xql 1 Nov 2001 19:17:16 -0000 1.6 @@ -154,7 +154,7 @@ -select '{'||content_item.get_title(:page_id)||'} '|| (CASE WHEN show_comments_p='t' then '1' else '0' END) from static_pages where static_page_id = :page_id +select '{'||content_item.get_title($page_id)||'} '||decode(show_comments_p,'t',1,0) from static_pages where static_page_id = :page_id Index: openacs-4/packages/static-pages/tcl/static-pages-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/static-pages/tcl/static-pages-procs-postgresql.xql,v diff -u -r1.11 -r1.12 --- openacs-4/packages/static-pages/tcl/static-pages-procs-postgresql.xql 31 Oct 2001 17:15:55 -0000 1.11 +++ openacs-4/packages/static-pages/tcl/static-pages-procs-postgresql.xql 1 Nov 2001 19:17:16 -0000 1.12 @@ -151,7 +151,7 @@ -select '{'||content_item__get_title(:page_id)||'} '||CASE WHEN show_comments_p='t' then '1' else '0' END from static_pages where static_page_id = :page_id +select '{' || content_item__get_title(:page_id) || '} ' || CASE WHEN show_comments_p=TRUE then '1' else '0' END from static_pages where static_page_id = :page_id Index: openacs-4/packages/static-pages/tcl/static-pages-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/static-pages/tcl/static-pages-procs.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/static-pages/tcl/static-pages-procs.tcl 23 Oct 2001 18:53:36 -0000 1.5 +++ openacs-4/packages/static-pages/tcl/static-pages-procs.tcl 1 Nov 2001 19:17:16 -0000 1.6 @@ -335,7 +335,7 @@ @author Brandoch Calef (bcalef@arsdigita.com) @creation-date 2001-02-23 } { - return [db_list get_page_info "select '{'||content_item.get_title($page_id)||'} '||decode(show_comments_p,'t',1,0) from static_pages where static_page_id = $page_id"] + return [db_string get_page_info "select '{'||content_item.get_title($page_id)||'} '||decode(show_comments_p,'t',1,0) from static_pages where static_page_id = $page_id"] } @@ -375,8 +375,6 @@ if { $page_id >= 0 } { set page_info [util_memoize [list sp_get_page_info_query $page_id]] - - # We only show the link here if the_public has # general_comments_create privilege on the page. Why the_public # rather than the current user? Because we don't want admins to @@ -389,6 +387,7 @@ } append comment_link "[general_comments_get_comments -print_content_p [lindex $page_info 1] $page_id [ad_conn url]]" + if { [catch { set fp [open $filename r] set file_contents [read $fp]