Index: openacs-4/packages/acs-content-repository/tcl/revision-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/revision-procs.tcl,v
diff -u -r1.30.4.3 -r1.30.4.4
--- openacs-4/packages/acs-content-repository/tcl/revision-procs.tcl	30 Sep 2013 17:44:27 -0000	1.30.4.3
+++ openacs-4/packages/acs-content-repository/tcl/revision-procs.tcl	7 Oct 2013 16:55:59 -0000	1.30.4.4
@@ -30,7 +30,7 @@
 } {
 
     if { [info exists revision_id] && [info exists item_id] } {
-        ad_return -code error "Both revision_id and item_id were specfied"
+	error "Both revision_id and item_id were specfied"
     }
 
     if { [info exists item_id] } {
@@ -42,13 +42,13 @@
             error "There is no content that matches revision_id '$revision_id'" {} NOT_FOUND
         }
     } else {
-        ad_return -code error "Either revision_id or item_id must be specified"
+        error "Either revision_id or item_id must be specified"
     }
 
     if { $storage_type ne "file" && \
          $storage_type ne "text" && \
          $storage_type ne "lob" } {
-        ad_return -code error "Storage type '$storage_type' is invalid."
+        error "Storage type '$storage_type' is invalid."
     }
 
     # I set content length to 0 here because otherwise I need to do
@@ -69,7 +69,7 @@
             set path [cr_fs_path $storage_area_key]
             set filename [db_string write_file_content ""]
 	    if {$filename eq ""} {
-		ad_return -code error "No content for the revision $revision_id.\
+		error "No content for the revision $revision_id.\
 		This seems to be an error which occured during the upload of the file"
 	    } else {
 		if { $string_p } {
@@ -226,7 +226,7 @@
             image {
 
                 if { [db_string image_subclass ""] eq "f" } {
-                    ad_return -code error "Image file must be stored in an image object"
+                    error "Image file must be stored in an image object"
                 }
     
                 set what_aolserver_told_us ""
@@ -238,7 +238,7 @@
 		    # we don't have built in png size detection
 		    # but we want to allow upload of png images
 		} else {
-                    ad_return -code error "Unknown image type"
+                    error "Unknown image type"
                 }
 
                 # the AOLserver jpegsize command has some bugs where the height comes 
@@ -265,11 +265,11 @@
             default {
 
                 if { $image_only_p } {
-                    ad_return -code error "The file you uploaded was not an image (.gif, .jpg or .jpeg) file"
+                    error "The file you uploaded was not an image (.gif, .jpg or .jpeg) file"
                 }
 
                 if { [db_string content_revision_subclass ""] eq "f" } {
-                    ad_return -code error "Content must be stored in a content revision object"
+                    error "Content must be stored in a content revision object"
                 }
 
                 if { !$old_item_p } {
Index: openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl,v
diff -u -r1.113.2.13 -r1.113.2.14
--- openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl	7 Oct 2013 16:42:30 -0000	1.113.2.13
+++ openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl	7 Oct 2013 16:55:59 -0000	1.113.2.14
@@ -144,7 +144,13 @@
     return $form
 }
 
-ad_proc ad_return { args } {
+#
+# GN: maybe this function was useful for ancient versions of tcl, but
+# unless i oversee something, it does not make any sense. The comment
+# argues, that "return -code ..." ignores the error code, but then the
+# function uses "return -code ..." to fix this...
+#
+ad_proc -deprecated ad_return { args } {
 
   Works like the "return" Tcl command, with one difference. Where
   "return" will always return TCL_RETURN, regardless of the -code