Index: openacs-4/packages/acs-tcl/lib/ad-return-complaint.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/lib/ad-return-complaint.adp,v
diff -u -r1.5 -r1.5.2.1
--- openacs-4/packages/acs-tcl/lib/ad-return-complaint.adp	27 Oct 2014 16:40:04 -0000	1.5
+++ openacs-4/packages/acs-tcl/lib/ad-return-complaint.adp	24 May 2016 20:45:37 -0000	1.5.2.1
@@ -15,8 +15,7 @@
 <p>
   #acs-tcl.lt_Please_back_up_using_# <if @exception_count@ gt 1>#acs-tcl.errors#</if><else>#acs-tcl.error#</else>#acs-tcl.lt__and_resubmit_your_en#
 </p>
-
 <p>
   #acs-tcl.Thank_you#
 </p>
-
+<if @prev_url@ defined and @prev_url@ not nil><p> <a href="@prev_url@">#acs-tcl.Return_prev#</a></if></p>
Index: openacs-4/packages/acs-tcl/lib/complain.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/lib/complain.adp,v
diff -u -r1.6.2.1 -r1.6.2.2
--- openacs-4/packages/acs-tcl/lib/complain.adp	20 Sep 2015 15:40:15 -0000	1.6.2.1
+++ openacs-4/packages/acs-tcl/lib/complain.adp	24 May 2016 20:45:37 -0000	1.6.2.2
@@ -21,4 +21,5 @@
 <p>
   #acs-tcl.Thank_you#
 </p>
+<if @prev_url@ defined and @prev_url@ not nil><p> <a href="@prev_url@">#acs-tcl.Return_prev#</a></if></p>
 
Index: openacs-4/packages/acs-tcl/tcl/tcl-documentation-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/tcl-documentation-procs.tcl,v
diff -u -r1.36.2.23 -r1.36.2.24
--- openacs-4/packages/acs-tcl/tcl/tcl-documentation-procs.tcl	20 May 2016 19:47:49 -0000	1.36.2.23
+++ openacs-4/packages/acs-tcl/tcl/tcl-documentation-procs.tcl	24 May 2016 20:45:37 -0000	1.36.2.24
@@ -1181,8 +1181,9 @@
             }
             if {[catch {
                 set html [ad_parse_template \
-                              -params [list complaints [list context $::ad_page_contract_context]] \
-                              "/packages/acs-tcl/lib/complain"]
+                              -params [list complaints [list context $::ad_page_contract_context] \
+                                           [list prev_url [get_referrer]] \
+                                          ] "/packages/acs-tcl/lib/complain"]
             } errorMsg]} {
                 ad_log error "problem rendering complain page: $errorMsg"
                 set html "Invalid input"
@@ -2224,8 +2225,9 @@
     set exception_text $error
     ns_return 422 text/html [ad_parse_template \
                                  -params [list [list exception_count $exception_count] \
-                                              [list exception_text $exception_text]] \
-				 $complaint_template]
+                                              [list exception_text $exception_text] \
+                                              [list prev_url  [get_referrer]] \
+                                             ]  $complaint_template]
 }
 
 # Local variables: