Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-07 16:41:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Photo for users and members were saved with .jpg even if .png

Browse Source
This commit is contained in:
Laurent Destailleur
2010-02-13 22:20:32 +00:00
parent 45f5af14ef
commit d5c786d805
11 changed files with 83 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/html.form.class.php
View File

@@ -2914,7 +2914,7 @@ class Form
/**
* \brief Return HTML code to output a photo
* \param modulepart Id to define module concerned
* \param object Object containing data to retreive file name
* \param object Object containing data to retrieve file name
* \param width Width of photo
* \return string HTML code to output photo
*/
@@ -2927,13 +2927,15 @@ class Form
if ($modulepart=='userphoto')
{
$dir=$conf->user->dir_output;
$file=$object->id.".jpg";
$file=get_exdir($object->id,2).$object->photo;
$altfile=$object->id.".jpg"; // For backward compatibility
$email=$object->email;
}
if ($modulepart=='memberphoto')
{
$dir=$conf->adherent->dir_output;
$file=$object->id.".jpg";
$file=get_exdir($object->id,2).$object->photo;
$altfile=$object->id.".jpg"; // For backward compatibility
$email=$object->email;
}
@@ -2942,6 +2944,10 @@ class Form
if (file_exists($dir."/".$file))
{
$ret.='<img alt="Photo" width="'.$width.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&file='.urlencode($file).'">';
}
else if (file_exists($dir."/".$altfile))
{
$ret.='<img alt="Photo" width="'.$width.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&file='.urlencode($altfile).'">';
}
else
{