Index: openacs-4/contrib/packages/cop-base/lib/cop-footer.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/cop-base/lib/cop-footer.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/cop-base/lib/cop-footer.tcl	31 Mar 2004 21:15:22 -0000	1.2
+++ openacs-4/contrib/packages/cop-base/lib/cop-footer.tcl	31 Mar 2004 22:31:52 -0000	1.3
@@ -1,5 +1,5 @@
 # generic stuff we need
-set url [cop::util::url -subsite_id [ad_conn subsite_id]]
+set url [cop::util::url]
 set subsite [ad_conn subsite_id]
 set user_id [ad_conn user_id]
 set cur_pkg [ad_conn package_id]
Index: openacs-4/contrib/packages/cop-base/lib/install.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/cop-base/lib/install.xml,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/cop-base/lib/install.xml	31 Mar 2004 21:15:22 -0000	1.1
+++ openacs-4/contrib/packages/cop-base/lib/install.xml	31 Mar 2004 22:31:52 -0000	1.2
@@ -16,7 +16,7 @@
 
       <mount package="acs-subsite" mount-point="$base_url" instance-name="$name"/>
       <set-parameter url="$base_url" name="DefaultMaster" value="/packages/cop-ui/lib/cop-master"/>
-      <set-parameter url="$base_url" name="IndexRedirectUrl" value="/packages/cop-ui/lib/index"/>
+      <set-parameter url="$base_url" name="IndexInternalRedirectUrl" value="/packages/cop-ui/lib/index"/>
       <mount package="forums" mount-point="$base_url/forums" instance-name="Forums"/>
 
       <mount package="file-storage" mount-point="$base_url/files" instance-name="Files"/>
Index: openacs-4/contrib/packages/cop-base/tcl/cop-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/cop-base/tcl/cop-procs.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/cop-base/tcl/cop-procs.tcl	31 Mar 2004 21:15:22 -0000	1.2
+++ openacs-4/contrib/packages/cop-base/tcl/cop-procs.tcl	31 Mar 2004 22:31:54 -0000	1.3
@@ -77,7 +77,7 @@
     # Interpolate the vars.
     if {![empty_string_p binds]} { 
         foreach {var val} $binds {
-            set $var $val
+            set $var [ad_quotehtml $val]
         }
         if {[catch {set __the_body__ [subst -nobackslashes -nocommands ${__the_body__}]} err]} { 
             error $err
Index: openacs-4/contrib/packages/cop-ui/lib/cop-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/cop-ui/lib/cop-master.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/cop-ui/lib/cop-master.adp	31 Mar 2004 21:12:16 -0000	1.1
+++ openacs-4/contrib/packages/cop-ui/lib/cop-master.adp	31 Mar 2004 22:31:55 -0000	1.2
@@ -95,3 +95,7 @@
       <div style="clear: both;"></div>
       <if @subsections:rowcount@ gt 0></div></if>
 </div>
+<if @displayed_object_id@ not nil>
+  <include src="/packages/cop-base/lib/cop-footer" displayed_object_id="@displayed_object_id@" />
+</if>
+