Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-09 19:18:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Regression

Browse Source
This commit is contained in:
Laurent Destailleur
2011-06-16 21:15:45 +00:00
parent 10bb64b2cd
commit 9eae2afde8
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/adherents/card_subscriptions.php
View File

@@ -484,17 +484,19 @@ if ($rowid)
print $html->showrefnav($adh,'rowid'); print $html->showrefnav($adh,'rowid');
print '</td></tr>'; print '</td></tr>';
$showphoto='<td rowspan="'.$rowspan.'" align="center" valign="middle" width="25%">'.$html->showphoto('memberphoto',$adh).'</td>';
// Login // Login
if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) 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 // Morphy
print '<tr><td>'.$langs->trans("Nature").'</td><td class="valeur" >'.$adh->getmorphylib().'</td>'; print '<tr><td>'.$langs->trans("Nature").'</td><td class="valeur" >'.$adh->getmorphylib().'</td>';
print '<td rowspan="'.$rowspan.'" align="center" valign="middle" width="25%">'; print $showphoto; $showphoto='';
print $html->showphoto('memberphoto',$adh);
print '</td>';
print '</tr>'; print '</tr>';
// Type // Type

2
htdocs/adherents/class/adherent.class.php
View File

@@ -217,7 +217,7 @@ class Adherent extends CommonObject
'%PASSWORD%'=>$msgishtml?dol_htmlentitiesbr($this->pass):$this->pass '%PASSWORD%'=>$msgishtml?dol_htmlentitiesbr($this->pass):$this->pass
); );
$substitutionarray=complete_substitutions_array($substitutionarray, $langs); complete_substitutions_array($substitutionarray, $langs);
return make_substitutions($text,$substitutionarray); return make_substitutions($text,$substitutionarray);
} }

2
htdocs/lib/functions.lib.php
View File

@@ -3578,7 +3578,7 @@ function dol_textishtml($msg,$option=0)
*/ */
function make_substitutions($chaine,$substitutionarray) function make_substitutions($chaine,$substitutionarray)
{ {
if (! is_array($substitutionarray)) return 'ErrorBadParametersCalling_make_substitutions'; if (! is_array($substitutionarray)) return 'ErrorBadParameterSubstitutionArrayWhenCalling_make_substitutions';
// Make substitition // Make substitition
foreach ($substitutionarray as $key => $value) foreach ($substitutionarray as $key => $value)

2
scripts/emailings/mailing-send.php
View File

@@ -146,7 +146,7 @@ if ($resql)
'__OTHER5__' => $other5 '__OTHER5__' => $other5
); );
$substitutionarray=complete_substitutions_array($substitutionarray,$langs); complete_substitutions_array($substitutionarray,$langs);
$newsubject=make_substitutions($subject,$substitutionarray); $newsubject=make_substitutions($subject,$substitutionarray);
$newmessage=make_substitutions($message,$substitutionarray); $newmessage=make_substitutions($message,$substitutionarray);