Skip to content
Snippets Groups Projects
Commit 5f0c4dbe authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

Fix: TCPDF error file not found in member card generation

parent 3f08664e
No related branches found
No related tags found
No related merge requests found
...@@ -24,6 +24,7 @@ Fix: Nb of notes and doc not visible onto tasks. ...@@ -24,6 +24,7 @@ Fix: Nb of notes and doc not visible onto tasks.
Fix: [ bug #1372 ] Margin calculation does not work in proposals. Fix: [ bug #1372 ] Margin calculation does not work in proposals.
Fix: [ bug #1381 ] PHP Warning when listing stock transactions page. Fix: [ bug #1381 ] PHP Warning when listing stock transactions page.
Fix: [ bug #1367 ] "Show invoice" link after a POS sell throws an error. Fix: [ bug #1367 ] "Show invoice" link after a POS sell throws an error.
Fix: TCPDF error file not found in member card generation.
***** ChangeLog for 3.5.2 compared to 3.5.1 ***** ***** ChangeLog for 3.5.2 compared to 3.5.1 *****
Fix: Can't add user for a task. Fix: Can't add user for a task.
......
...@@ -161,9 +161,12 @@ class pdf_standard ...@@ -161,9 +161,12 @@ class pdf_standard
// Define photo // Define photo
$dir=$conf->adherent->dir_output; $dir=$conf->adherent->dir_output;
if (! empty($photo))
{
$file=get_exdir($idmember,2).'photos/'.$photo; $file=get_exdir($idmember,2).'photos/'.$photo;
$photo=$dir.'/'.$file; $photo=$dir.'/'.$file;
if (empty($photo) || ! is_readable($photo)) $photo=''; if (! is_readable($photo)) $photo='';
}
// Define background image // Define background image
$backgroundimage=''; $backgroundimage='';
......
...@@ -157,6 +157,12 @@ class pdf_standardlabel ...@@ -157,6 +157,12 @@ class pdf_standardlabel
} }
} }
// Define photo
if (! empty($photo))
{
if (! is_readable($photo)) $photo='';
}
// Define background image // Define background image
$backgroundimage=''; $backgroundimage='';
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment