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.13 -r1.14
--- openacs-4/packages/faq/www/one-faq.tcl	20 Jan 2018 23:16:24 -0000	1.13
+++ openacs-4/packages/faq/www/one-faq.tcl	3 Sep 2024 15:37:38 -0000	1.14
@@ -5,10 +5,10 @@
     @author Jennie Housman (jennie@ybos.net)
     @author Nima Mazloumi (nima.mazloumi@gmx.de)
     @creation-date 2000-10-24
- 
+
 } {
-    {category_id:naturalnum,optional {}}
-    faq_id:naturalnum,notnull
+    {category_id:object_type(category) {}}
+    faq_id:object_type(faq)
 }
 
 #/faq/www/one-faq.tcl
@@ -39,28 +39,28 @@
 
 # Site-Wide Categories
 if { $use_categories_p == 1} {
-    set package_url [ad_conn package_url]      
+    set package_url [ad_conn package_url]
     if { $category_id ne "" } {
-	set category_name [category::get_name $category_id]
-	if { $category_name eq "" } {
-	    ad_return_exception_page 404 "No such category" \
+        set category_name [category::get_name $category_id]
+        if { $category_name eq "" } {
+            ad_return_exception_page 404 "No such category" \
                 "Site-wide Category with ID $category_id doesn't exist"
             ad_script_abort
-	}
+        }
 
-	# 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_info(faq_name)] $category_name]
-    }    
+        # 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_info(faq_name)] $category_name]
+    }
 
     db_multirow -unclobber -extend { category_name tree_name } categories faq_categories "" {
-	set category_name [category::get_name $category_id]
-	set tree_name [category_tree::get_name $tree_id]
+        set category_name [category::get_name $category_id]
+        set tree_name [category_tree::get_name $tree_id]
     }
 }
 
 set return_url [export_vars -base [ad_conn url] {faq_id}]
 
-if { [apm_package_installed_p "general-comments"] 
+if { [namespace which ::general_comments_create_link] ne ""
      && [parameter::get -package_id $package_id -parameter GeneralCommentsP -default 0] } {
     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]