From b48fe684d358c9cecaa793b51c51a95dde0eed60 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Sun, 24 Sep 2017 17:43:01 +0200
Subject: [PATCH] Fix: wrong return when cancel

---
 htdocs/adherents/card.php | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index 479af36a134..0ef0a4e3dc3 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -121,17 +121,6 @@ $hookmanager->initHooks(array('membercard','globalcard'));
  * 	Actions
  */
 
-if ($cancel) {
-
-	$action='';
-
-	if (! empty($backtopage))
-	{
-		header("Location: ".$backtopage);
-		exit;
-	}
-}
-
 $parameters=array('id'=>$id, 'rowid'=>$id, 'objcanvas'=>$objcanvas);
 $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -986,11 +975,18 @@ else
 
         dol_fiche_end();
 
-	    print '<div class="center">';
-	    print '<input type="submit" name="button" class="button" value="'.$langs->trans("AddMember").'">';
-	    print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	    print '<input type="submit" name="cancel" class="button" value="'.$langs->trans("Cancel").'">';
-	    print '</div>';
+		print '<div class="center">';
+		print '<input type="submit" name="button" class="button" value="'.$langs->trans("AddMember").'">';
+		print '&nbsp;&nbsp;';
+		if (! empty($backtopage))
+		{
+			print '<input type="submit" class="button" name="cancel" value="'.$langs->trans('Cancel').'">';
+		}
+		else
+		{
+			print '<input type="button" class="button" value="' . $langs->trans("Cancel") . '" onClick="javascript:history.go(-1)">';
+		}
+		print '</div>';
 
 		print "</form>\n";
 	}