Fix: missing path of user photo

Dolibarr · Oct 28, 2016 · d0bd1d5 · d0bd1d5
1 parent acf8874
commit d0bd1d5
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
@@ -35,8 +35,8 @@ abstract class CommonDocGenerator
 {
 	var $error='';
 	protected $db;
-	
-	
+
+
 	/**
 	 *	Constructor
 	 *
@@ -59,6 +59,8 @@ function get_substitutionarray_user($user,$outputlangs)
     {
         global $conf;
 
+        $logotouse=$conf->user->dir_output.'/'.get_exdir($user->id, 2, 0, 1, $user, 'user').'/'.$user->photo;
+
         return array(
             'myuser_lastname'=>$user->lastname,
             'myuser_firstname'=>$user->firstname,
@@ -75,7 +77,7 @@ function get_substitutionarray_user($user,$outputlangs)
         	'myuser_fax'=>$user->office_fax,
             'myuser_mobile'=>$user->user_mobile,
             'myuser_email'=>$user->email,
-        	'myuser_logo'=>$user->photo,
+        	'myuser_logo'=>$logotouse,
         	'myuser_job'=>$user->job,
             'myuser_web'=>''	// url not exist in $user object
         );
@@ -390,7 +392,7 @@ function get_substitutionarray_object($object,$outputlangs,$array_key='object')
 		// Add vat by rates
 		foreach ($object->lines as $line)
 		{
-		    // $line->tva_tx format depends on database field accuraty, no reliable. This is kept for backward comaptibility 
+		    // $line->tva_tx format depends on database field accuraty, no reliable. This is kept for backward comaptibility
 			if (empty($resarray[$array_key.'_total_vat_'.$line->tva_tx])) $resarray[$array_key.'_total_vat_'.$line->tva_tx]=0;
 			$resarray[$array_key.'_total_vat_'.$line->tva_tx]+=$line->total_tva;
 			$resarray[$array_key.'_total_vat_locale_'.$line->tva_tx]=price($resarray[$array_key.'_total_vat_'.$line->tva_tx]);
@@ -582,7 +584,7 @@ function fill_substitutionarray_with_extrafields($object,$array_to_fill,$extrafi
 				$object->array_options['options_'.$key] = $extrafields->attribute_param[$key]['options'][$object->array_options['options_'.$key]];
 			}
 			else if($extrafields->attribute_type[$key] == 'date')
-			{	
+			{
 				if (strlen($object->array_options['options_'.$key])>0)
 				{
 					$object->array_options['options_'.$key] = dol_print_date($object->array_options['options_'.$key],'day');                                       // using company output language