From c9d8e041d56a7bd5cc32681f2be8bdf0ec18fdde Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Mon, 5 Oct 2015 15:20:55 +0200
Subject: [PATCH] FIX : New adherent from, always redirect on entity

---
 htdocs/public/members/new.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index 255e7fe9134..e9c8264d549 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -304,7 +304,6 @@ if ($action == 'add')
                     $urlback=DOL_MAIN_URL_ROOT.'/public/paybox/newpayment.php?from=membernewform&source=membersubscription&ref='.$adh->ref;
                     if (price2num(GETPOST('amount'))) $urlback.='&amount='.price2num(GETPOST('amount'));
                     if (GETPOST('email')) $urlback.='&email='.urlencode(GETPOST('email'));
-                    if (! empty($entity)) $urlback.='&entity='.$entity;
                 }
                 else if ($conf->global->MEMBER_NEWFORM_PAYONLINE == 'paypal')
                 {
@@ -315,7 +314,7 @@ if ($action == 'add')
                     {
                     	$urlback.='&securekey='.dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . 'membersubscription' . $adh->ref, 2);
                     }
-                    if (! empty($entity)) $urlback.='&entity='.$entity;
+                    
                 }
                 else
                 {
@@ -324,6 +323,7 @@ if ($action == 'add')
                 }
             }
 
+            if (! empty($entity)) $urlback.='&entity='.$entity;
             dol_syslog("member ".$adh->ref." was created, we redirect to ".$urlback);
             Header("Location: ".$urlback);
             exit;