Index: openacs-4/packages/contacts/lib/contacts-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/contacts-master.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/contacts/lib/contacts-master.tcl	17 Jun 2005 08:58:17 -0000	1.4
+++ openacs-4/packages/contacts/lib/contacts-master.tcl	19 Jun 2005 07:00:28 -0000	1.5
@@ -8,20 +8,17 @@
 
 if { [site_node::get_package_url -package_key "tasks"] != "" } {
     set prefix "/contacts/"
-} else {
-    set prefix "${package_url}"
-}
-if { [site_node::get_package_url -package_key "tasks"] != "" } {
     set tasks_enabled_p 1
 } else {
+    set prefix "${package_url}"
     set tasks_enabled_p 0
 }
 
 set link_list [list]
 lappend link_list "${prefix}"
 lappend link_list "[_ contacts.Contacts]"
 
-if { ![parameter::get -boolean -parameter "ForceSearchBeforeAdd" -default "0"] || !${tasks_enabled_p} } {
+if { ![parameter::get -boolean -parameter "ForceSearchBeforeAdd" -default "0"] &&  !${tasks_enabled_p} } {
     lappend link_list "${prefix}add/person"
     lappend link_list "[_ contacts.Add_Person]"