Index: openacs-4/packages/acs-lang/www/admin/message-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/message-delete.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-lang/www/admin/message-delete.tcl	13 Aug 2007 11:13:46 -0000	1.4
+++ openacs-4/packages/acs-lang/www/admin/message-delete.tcl	18 Apr 2008 06:48:43 -0000	1.5
@@ -13,10 +13,6 @@
     message_key
     show:optional
     confirm_p:optional
-    unregister_p:optional
-    {subm_delete {}}
-    {subm_unreg {}}
-    {return_url {}}
 }
 
 
@@ -32,30 +28,15 @@
                  [list "message-list?[export_vars { locale package_key show }]" $package_key] \
                  $page_title]
 
-# We let you unregister the messages key if you're in the default locale
-set unregister_p [string equal $current_locale $default_locale]
-set form_export_vars [export_vars -form { locale package_key message_key show {confirm_p 1} unregister_p return_url}]
+set form_export_vars [export_vars -form { locale package_key message_key show {confirm_p 1} }]
 
+
 if { [exists_and_not_null confirm_p] && [template::util::is_true $confirm_p] } {
-    # check if we delete or unregister
-    
-    if {[string length $subm_delete]} {
-	lang::message::delete \
-	    -package_key $package_key \
-	    -message_key $message_key \
-	    -locale $locale
-    }
+    lang::message::delete \
+        -package_key $package_key \
+        -message_key $message_key \
+        -locale $locale
 
-    if {[string length $subm_unreg]} {
-	lang::message::unregister \
-	     $package_key \
-	     $message_key 
-    }
-    
-    if {[string length $return_url]} {
-        ad_returnredirect $return_url
-    } else {
-        ad_returnredirect "message-list?[export_vars { locale package_key show }]"
-    }
+    ad_returnredirect "message-list?[export_vars { locale package_key show }]"
     ad_script_abort
 }