Index: openacs-4/packages/faq/www/one-faq.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/one-faq.adp,v diff -u -r1.16.2.2 -r1.16.2.3 --- openacs-4/packages/faq/www/one-faq.adp 18 Mar 2007 01:56:11 -0000 1.16.2.2 +++ openacs-4/packages/faq/www/one-faq.adp 21 Mar 2007 06:01:18 -0000 1.16.2.3 @@ -2,12 +2,12 @@ @context;noquote@ #faq.FAQs# -

@faq_name;noquote@

+

@faq_info.faq_name;noquote@

@notification_chunk;noquote@

-@faq_name;noquote@ +@faq_info.faq_name;noquote@ @faq_id;noquote@ @@ -18,12 +18,12 @@
    - +
  1. @one_question.question;noquote@
  2. - +
  3. @one_question.question;noquote@ @@ -34,7 +34,7 @@
- +
    Index: openacs-4/packages/faq/www/one-faq.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/one-faq.tcl,v diff -u -r1.7.2.2 -r1.7.2.3 --- openacs-4/packages/faq/www/one-faq.tcl 18 Mar 2007 01:56:11 -0000 1.7.2.2 +++ openacs-4/packages/faq/www/one-faq.tcl 21 Mar 2007 06:01:52 -0000 1.7.2.3 @@ -19,12 +19,14 @@ ad_require_permission $package_id faq_view_faq -if {![db_0or1row faq_info "select faq_name, separate_p from faqs where faq_id=:faq_id"]} { +faq::get_instance_info -arrayname faq_info -faq_id $faq_id + +if { [empty_string_p $faq_info(faq_name)] } { ns_returnnotfound ad_script_abort } -set context [list $faq_name] +set context [list $faq_info(faq_name)] # Use Categories? set use_categories_p [parameter::get -parameter "EnableCategoriesP" -default 0] @@ -48,7 +50,7 @@ } # Replace last element of context (the FAQ name) with link to that FAQ and current category name - set context [lreplace $context end end [list "one-faq?faq_id=$faq_id" $faq_name] $category_name] + set context [lreplace $context end end [list "one-faq?faq_id=$faq_id" $faq_info(faq_name)] $category_name] } db_multirow -unclobber -extend { category_name tree_name } categories faq_categories "" { @@ -60,14 +62,14 @@ set notification_chunk [notification::display::request_widget \ -type one_faq_qa_notif \ -object_id $faq_id \ - -pretty_name $faq_name \ + -pretty_name $faq_info(faq_name) \ -url [ad_conn url]?faq_id=$faq_id \ ] set return_url "[ad_conn url]?faq_id=$faq_id" if { [apm_package_installed_p "general-comments"] && [ad_parameter "GeneralCommentsP" -package_id [ad_conn package_id]] } { - set gc_link [general_comments_create_link $faq_id $return_url] + set gc_link [general_comments_create_link -link_attributes { title="#general-comments.Add_comment#" } $faq_id $return_url] set gc_comments [general_comments_get_comments $faq_id $return_url] } else { set gc_link ""