Index: openacs-4/packages/dotlrn/www/register.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/register.tcl,v
diff -u -r1.22.2.2 -r1.22.2.3
--- openacs-4/packages/dotlrn/www/register.tcl	29 Mar 2022 15:42:20 -0000	1.22.2.2
+++ openacs-4/packages/dotlrn/www/register.tcl	14 Apr 2023 13:25:19 -0000	1.22.2.3
@@ -101,9 +101,11 @@
 
         "
 
-            set package_id [site_node_apm_integration::get_child_package_id \
-                                -package_id [dotlrn_community::get_package_id $community_id] \
-                                -package_key [bulk_mail::package_key]]
+            set community_node_id [dotlrn_community::get_community_node_id $community_id]
+            set package_id [lindex [site_node::get_children \
+                                        -package_key [bulk_mail::package_key] \
+                                        -element object_id \
+                                        -node_id $community_node_id] 0]
 
             bulk_mail::new \
                     -package_id $package_id \
Index: openacs-4/packages/dotlrn/www/spam.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/spam.tcl,v
diff -u -r1.39.2.3 -r1.39.2.4
--- openacs-4/packages/dotlrn/www/spam.tcl	23 Feb 2023 14:28:33 -0000	1.39.2.3
+++ openacs-4/packages/dotlrn/www/spam.tcl	14 Apr 2023 13:25:19 -0000	1.39.2.4
@@ -217,8 +217,13 @@
 	set message_type "text"
     }
 
+    set bm_package_id [lindex [site_node::get_children \
+                                   -package_key [bulk_mail::package_key] \
+                                   -element object_id \
+                                   -node_id [ad_conn node_id]] 0]
+
     bulk_mail::new \
-        -package_id [site_node_apm_integration::get_child_package_id -package_key [bulk_mail::package_key]] \
+        -package_id $bm_package_id \
         -send_date [template::util::date::get_property linear_date $send_date] \
         -date_format "YYYY MM DD HH24 MI SS" \
         -from_addr $from \
Index: openacs-4/packages/dotlrn/www/weblog-control-panel.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/weblog-control-panel.tcl,v
diff -u -r1.7.2.1 -r1.7.2.2
--- openacs-4/packages/dotlrn/www/weblog-control-panel.tcl	9 Aug 2019 21:40:46 -0000	1.7.2.1
+++ openacs-4/packages/dotlrn/www/weblog-control-panel.tcl	14 Apr 2023 13:25:19 -0000	1.7.2.2
@@ -25,11 +25,13 @@
 set user_id [auth::require_login]
 
 
-set dotlrn_package_id [dotlrn::get_package_id]
+set weblog_package_id [lindex [site_node::get_children \
+                                   -package_key forums \
+                                   -element object_id \
+                                   -node_id [ad_conn node_id]] 0]
 
-set weblog_package_id [site_node_apm_integration::get_child_package_id  -package_key "forums"]
+set weblog_url [site_node::get_url_from_object_id -object_id $weblog_package_id]/forum-view
 
-set weblog_url "[dotlrn_community::get_url -package_id $weblog_package_id]/forum-view"
 db_multirow weblogs weblogs {select name, forum_id, to_char(o.last_modified, 'Mon DD, YYYY') as latest_post from forums_forums_enabled f, acs_objects o where o.object_id = forum_id and o.creation_user = :user_id and f.package_id = :weblog_package_id}
 
 
Index: openacs-4/packages/dotlrn/www/weblog-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/weblog-new.tcl,v
diff -u -r1.11.2.5 -r1.11.2.6
--- openacs-4/packages/dotlrn/www/weblog-new.tcl	24 Mar 2023 12:43:41 -0000	1.11.2.5
+++ openacs-4/packages/dotlrn/www/weblog-new.tcl	14 Apr 2023 13:25:19 -0000	1.11.2.6
@@ -28,7 +28,10 @@
 
 set user_id [auth::require_login]
 
-set weblog_package_id [site_node_apm_integration::get_child_package_id  -package_key "forums"]
+set weblog_package_id [lindex [site_node::get_children \
+                                   -package_key forums \
+                                   -element object_id \
+                                   -node_id [ad_conn node_id]] 0]
 set existing_forum_ids [db_list weblog_forum_id {select forum_id from forums_forums_enabled f, acs_objects o where o.object_id = forum_id and o.creation_user = :user_id and f.package_id = :weblog_package_id}]
 
 if {![llength $existing_forum_ids]} {
@@ -67,7 +70,7 @@
     #Probably a double click, send them to their first existing enabled weblog.
 }
 
-ad_returnredirect "[dotlrn_community::get_url -package_id $weblog_package_id]/forum-view?forum_id=$forum_id"
+ad_returnredirect [site_node::get_url_from_object_id -object_id $weblog_package_id]/forum-view?forum_id=$forum_id
 ad_script_abort
 
 # Local variables: