Index: openacs-4/contrib/packages/bcms-ui-base/www/manage/apply-template.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcms-ui-base/www/manage/apply-template.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/bcms-ui-base/www/manage/apply-template.tcl	27 Aug 2003 17:33:49 -0000	1.1
+++ openacs-4/contrib/packages/bcms-ui-base/www/manage/apply-template.tcl	9 Oct 2003 09:58:21 -0000	1.2
@@ -6,6 +6,9 @@
     return_url:notnull
 }
 
+set package_url [ad_conn package_url]
+set current_url [ad_return_url -urlencode]
+
 if {[info exists template_id]} {
 
     bcms::template::apply_template -item_id $item_id -template_id $template_id -context public
@@ -31,4 +34,10 @@
 
     set title "Apply Template"
     set context_help ""
+
+    array set current_template [bcms::template::get_template -item_id $item_id -context public]
+    if {[array size current_template] > 0 && ![string equal $current_template(name) default_template]} {
+        array set current_template [bcms::item::get_item -item_id $current_template(item_id) -revision live]
+    }
+    
 }