Index: openacs-4/packages/acs-subsite/www/user/portrait/upload.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/upload.tcl,v
diff -u -N -r1.20 -r1.21
--- openacs-4/packages/acs-subsite/www/user/portrait/upload.tcl	21 Jan 2018 00:35:30 -0000	1.20
+++ openacs-4/packages/acs-subsite/www/user/portrait/upload.tcl	19 Feb 2018 12:31:58 -0000	1.21
@@ -183,13 +183,15 @@
     # Flush the portrait cache
     util_memoize_flush [list acs_user::get_portrait_id_not_cached -user_id $user_id]
 
+} -after_submit {
+
     ad_returnredirect $return_url
     ad_script_abort
 
-} else {
-    ad_return_template
 }
 
+ad_return_template
+
 # Local variables:
 #    mode: tcl
 #    tcl-indent-level: 4