Index: openacs-4/packages/curriculum/tcl/misc-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum/tcl/misc-procs.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/curriculum/tcl/misc-procs.tcl	10 Jun 2003 09:29:49 -0000	1.4
+++ openacs-4/packages/curriculum/tcl/misc-procs.tcl	13 Jun 2003 11:44:33 -0000	1.5
@@ -49,7 +49,7 @@
 		    # "ad_conn subsite_id" does not work when called from within a filter
 		    # (which we do for the curriculum bar), so we use the following instead.
 
-		    return [site_node_closest_ancestor_package acs-subsite]
+		    return [site_node_closest_ancestor_package [list dotlrn acs-subsite]]
 		}
 		package_id -
 		package_url -
@@ -350,11 +350,14 @@
 
 # FIXME. Integrate with "enabled_elements" above?
 ad_proc -private curriculum::user_elements {
+    {-package_id ""}
 } {
     Not meant to be cached.
 } {
-    set package_id [conn package_id]
-
+    if { [empty_string_p $package_id] } {
+	set package_id [conn package_id]
+    }
+    
     set workflow_id [curriculum::get_instance_workflow_id -package_id $package_id]
 
     # We need to get elements of published curriculums.
@@ -453,18 +456,18 @@
 
 ad_proc -private curriculum::get_bar_internal {
     -bar_p:required
-    {-package_id ""}
+    -package_id:required
     cookie_value
 } {
     if { $bar_p } {
 
 	# Get the cached curriculum list for the bar.
-	set rows [enabled_elements_memoized]
+	set rows [enabled_elements_memoized -package_id $package_id]
 
     } else {
 
 	# Get the NOT cached curriculum list for index page use.
-	set rows [user_elements]
+	set rows [user_elements -package_id $package_id]
 
     }