Index: openacs.org-dev/packages/webmail/www/folder-rename-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/webmail/www/folder-rename-2.tcl,v
diff -u -r1.1.1.1 -r1.1.1.2
--- openacs.org-dev/packages/webmail/www/folder-rename-2.tcl	9 Jul 2002 17:35:19 -0000	1.1.1.1
+++ openacs.org-dev/packages/webmail/www/folder-rename-2.tcl	8 Oct 2002 15:47:44 -0000	1.1.1.2
@@ -13,14 +13,14 @@
 }
 
 if { [string equal $action2 "Cancel"] 
-|| [empty_string_p $folder_name] } {
+     || [empty_string_p $folder_name] } {
     ad_returnredirect "folder-index"
-    return
+    ad_script_abort
 }
 
 if { [string length $folder_name] > 50 } {
     wm_return_error "The folder name you entered ($folder_name) was invalid.  Please hit back and try again (the length limit is 50 characters)"
-    return
+    ad_script_abort
 } 
 
 set user_id [ad_maybe_redirect_for_registration]
@@ -29,7 +29,7 @@
 if { [wm_mailbox_name_reserved $name] } {
     wm_return_error "You are not allowed to rename the following mailboxes:
     [wm_mailbox_name_for_display INBOX], [wm_mailbox_name_for_display DRAFTS], [wm_mailbox_name_for_display SENT], [wm_mailbox_name_for_display TRASH], and SYSTEM."
-    return
+    ad_script_abort
 }
 
 with_catch errmsg {
@@ -38,9 +38,11 @@
     WHERE mailbox_id=:mailbox_id"
 } {
     wm_return_error "There was an error renaming your folder.  Most likely a folder with the same name already exists."
-    return
+    ad_script_abort
 }
+
 ad_returnredirect "folder-index"
-return
+ad_script_abort
 ad_set_client_property -persistent f "webmail" "mailbox_list" ""
 
+