Index: openacs.org-dev/packages/webmail/www/folder-change.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/webmail/www/folder-change.tcl,v
diff -u -r1.1.1.1 -r1.1.1.2
--- openacs.org-dev/packages/webmail/www/folder-change.tcl	9 Jul 2002 17:35:18 -0000	1.1.1.1
+++ openacs.org-dev/packages/webmail/www/folder-change.tcl	8 Oct 2002 15:47:44 -0000	1.1.1.2
@@ -15,8 +15,8 @@
 } -validate {
     action_valid -requires { action:notnull } {
 	if { ![string equal $action "Empty"] 
-	&& ![string equal $action "Delete"]
-	&& ![string equal $action "Rename"] } {
+             && ![string equal $action "Delete"]
+             && ![string equal $action "Rename"] } {
 	    ad_complain { You have entered an invalid action }
 	}
     }
@@ -26,15 +26,15 @@
 set folder_name [wm_mailbox_verify_and_get_name $mailbox_id $user_id]
 
 if { [string equal $action Empty]
-&& [string equal $folder_name "TRASH"] } {
+     && [string equal $folder_name "TRASH"] } {
     set action2 "Empty"
     ad_returnredirect "folder-change-2?[export_url_vars action action2 mailbox_id]"
-    return
+    ad_script_abort
 }
 
 set context "[ad_context_bar_ws [list "index?[export_url_vars mailbox_id]" "Webmail"] [list "folder-index" "Manage Folders"] "$action Folder"]"
 set folder_name [wm_mailbox_name_for_display $folder_name]
 set form_vars [export_form_vars action mailbox_id]
 
 ad_return_template
-return
+