From 9eae2afde8cda1b18d555ee0e68e785f8e3cc8b6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 16 Jun 2011 21:15:45 +0000
Subject: [PATCH] Fix: Regression

---
 htdocs/adherents/card_subscriptions.php   | 10 ++++++----
 htdocs/adherents/class/adherent.class.php |  2 +-
 htdocs/lib/functions.lib.php              |  2 +-
 scripts/emailings/mailing-send.php        |  2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/htdocs/adherents/card_subscriptions.php b/htdocs/adherents/card_subscriptions.php
index 22ec7827cad..03f571e1c46 100644
--- a/htdocs/adherents/card_subscriptions.php
+++ b/htdocs/adherents/card_subscriptions.php
@@ -484,17 +484,19 @@ if ($rowid)
     print $html->showrefnav($adh,'rowid');
     print '</td></tr>';
 
+    $showphoto='<td rowspan="'.$rowspan.'" align="center" valign="middle" width="25%">'.$html->showphoto('memberphoto',$adh).'</td>';
+
     // Login
     if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
     {
-        print '<tr><td>'.$langs->trans("Login").'</td><td class="valeur" colspan="2">'.$adh->login.'&nbsp;</td></tr>';
+        print '<tr><td>'.$langs->trans("Login").'</td><td class="valeur">'.$adh->login.'&nbsp;</td>';
+        print $showphoto; $showphoto='';
+        print '</tr>';
     }
 
     // Morphy
     print '<tr><td>'.$langs->trans("Nature").'</td><td class="valeur" >'.$adh->getmorphylib().'</td>';
-    print '<td rowspan="'.$rowspan.'" align="center" valign="middle" width="25%">';
-    print $html->showphoto('memberphoto',$adh);
-    print '</td>';
+    print $showphoto; $showphoto='';
     print '</tr>';
 
     // Type
diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 2a9e33da566..103cea62daf 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -217,7 +217,7 @@ class Adherent extends CommonObject
                '%PASSWORD%'=>$msgishtml?dol_htmlentitiesbr($this->pass):$this->pass
         );
 
-        $substitutionarray=complete_substitutions_array($substitutionarray, $langs);
+        complete_substitutions_array($substitutionarray, $langs);
 
         return make_substitutions($text,$substitutionarray);
     }
diff --git a/htdocs/lib/functions.lib.php b/htdocs/lib/functions.lib.php
index 84c7f250303..de7cd699f35 100644
--- a/htdocs/lib/functions.lib.php
+++ b/htdocs/lib/functions.lib.php
@@ -3578,7 +3578,7 @@ function dol_textishtml($msg,$option=0)
  */
 function make_substitutions($chaine,$substitutionarray)
 {
-    if (! is_array($substitutionarray)) return 'ErrorBadParametersCalling_make_substitutions';
+    if (! is_array($substitutionarray)) return 'ErrorBadParameterSubstitutionArrayWhenCalling_make_substitutions';
 
     // Make substitition
     foreach ($substitutionarray as $key => $value)
diff --git a/scripts/emailings/mailing-send.php b/scripts/emailings/mailing-send.php
index d398043aee5..9f435cdb9d8 100644
--- a/scripts/emailings/mailing-send.php
+++ b/scripts/emailings/mailing-send.php
@@ -146,7 +146,7 @@ if ($resql)
 				'__OTHER5__' => $other5
 			);
 
-			$substitutionarray=complete_substitutions_array($substitutionarray,$langs);
+			complete_substitutions_array($substitutionarray,$langs);
 			$newsubject=make_substitutions($subject,$substitutionarray);
 			$newmessage=make_substitutions($message,$substitutionarray);