Index: openacs-4/contrib/packages/portal/tcl/apm-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/tcl/apm-callback-procs.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/contrib/packages/portal/tcl/apm-callback-procs.tcl	14 Mar 2004 01:16:31 -0000	1.6
+++ openacs-4/contrib/packages/portal/tcl/apm-callback-procs.tcl	18 Mar 2004 00:51:13 -0000	1.7
@@ -21,6 +21,8 @@
         }
     }
 
+    source datasource-procs.tcl
+
     # Now define some default layouts.
 
     set var_list {
Index: openacs-4/contrib/packages/portal/tcl/portal-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/tcl/portal-procs.tcl,v
diff -u -r1.21 -r1.22
--- openacs-4/contrib/packages/portal/tcl/portal-procs.tcl	17 Mar 2004 02:15:53 -0000	1.21
+++ openacs-4/contrib/packages/portal/tcl/portal-procs.tcl	18 Mar 2004 00:51:13 -0000	1.22
@@ -728,10 +728,15 @@
         @param package_id The package_id of this portal instance (default ad_conn package_id)
         @return True if we've already initialized this instance of the portal package.
     } {
+        if { ![info exists package_id] } {
+            set package_id [ad_conn package_id]
+        }
+
         return [expr {![string equal [get_master_template_id -package_id $package_id] ""]}]
     }
 
     ad_proc -public initialize {
+        -package_id
     } {
         Initialize this instance of the portal package if we've not already done so.  This
         consists of creating the master template, which is assigned to party 0 and will be
@@ -740,7 +745,11 @@
 
         The admin portal is created with our package_id as the owner.
     } {
-        if { ![initialized] } {
+        if { ![info exists package_id] } {
+            set package_id [ad_conn package_id]
+        }
+
+        if { ![initialized -package_id $package_id] } {
      
             # create the master template