Index: openacs-4/packages/acs-subsite/acs-subsite.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/acs-subsite.info,v
diff -u -r1.40 -r1.41
--- openacs-4/packages/acs-subsite/acs-subsite.info	16 Jan 2003 13:36:29 -0000	1.40
+++ openacs-4/packages/acs-subsite/acs-subsite.info	29 Jan 2003 16:08:45 -0000	1.41
@@ -487,7 +487,6 @@
             <file type="content_page" path="www/pvt/alerts.adp"/>
             <file type="content_page" path="www/pvt/alerts.tcl"/>
             <file type="query_file" path="www/pvt/alerts.xql"/>
-            <file type="query_file" db_type="oracle" path="www/pvt/home-oracle.xql"/>
             <file type="content_page" path="www/pvt/home.adp"/>
             <file type="content_page" path="www/pvt/home.tcl"/>
             <file type="query_file" db_type="postgresql" path="www/pvt/home.xql"/>
@@ -613,6 +612,9 @@
             <file type="content_page" path="www/user/portrait/upload.adp"/>
             <file type="content_page" path="www/user/portrait/upload.tcl"/>
         </files>
+        <callbacks>
+            <callback type="after-mount" proc="acs_subsite_after_mount_callback" />
+        </callbacks>
         <parameters>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="RequireQuestionForPasswordResetP"  default="1" description="Do we require a question/answer pair to reset a users password?" section_name="user-login"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="DefaultMaster"  default="/www/default-master" description="Path to the default master page (skin) for acs-templating.  Extensions                                             .adp/.tcl are implied."/>
Index: openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl	29 Jan 2003 16:09:01 -0000	1.2
@@ -15,24 +15,18 @@
 }
 
 
-ad_proc -public acs_subsite_post_instantiation { 
-    package_id
+ad_proc -public acs_subsite_after_mount_callback { 
+    {-package_id:required}
+    {-node_id:required}
 } {
     This is the TCL proc that is called automatically by the APM
-    whenever a new instance of the subsites application is created.
+    whenever a new instance of the subsites application is mounted.
 
-    @author Michael Bryzek (mbryzek@arsdigita.com)
-    @creation-date 2000-03-05
-
-    @param package_id The package_id of the newly mounted subsites
-    application
-
+    @author Peter Marklund
 } {
     subsite::configure_if_necessary -package_id $package_id
 }
 
-
-
     ad_proc subsite::configure_if_necessary {
 	{-package_id ""}
     } {
@@ -216,7 +210,8 @@
     package_key
 } {
     Mounts a new instance of the application specified by package_key
-    beneath node_id
+    beneath node_id. This proc makes sure that the instance_name (the
+    name of the new node) is unique before invoking site_node::instantiate_and_mount.
     
     @author Michael Bryzek (mbryzek@arsdigita.com)
     @creation-date 2001-02-28
@@ -231,6 +226,8 @@
 
     @param node_id Defaults to [ad_conn node_id]
 
+    @see site_node::instantiate_and_mount
+
     @return The package id of the newly mounted package 
 
 } {
@@ -266,8 +263,10 @@
 	}
     }
 
-    return [site_node_mount_application -return package_id $node_id $instance_name $package_key $pretty_name]
-
+    return [site_node::instantiate_and_mount -parent_node_id $node_id \
+                                             -node_name $instance_name \
+                                             -package_name $pretty_name \
+                                             -package_key $package_key]
 }
 
 ad_proc subsite::util::sub_type_exists_p {