Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
This commit is contained in:
commit
63abd9ea5c
5 changed files with 9 additions and 2 deletions
|
|
@ -224,5 +224,6 @@ class Canvas
|
|||
$ret = $this->control->doActions($action, $id);
|
||||
return $ret;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ class Utils
|
|||
public $output;
|
||||
|
||||
/**
|
||||
* @var array{'commandbackuplastdone': string, 'commandbackuptorun': string} Used by Cron method to return data
|
||||
* @var array{commandbackuplastdone:string,commandbackuptorun:string} Used by Cron method to return data
|
||||
*/
|
||||
public $result;
|
||||
|
||||
|
|
|
|||
|
|
@ -9809,6 +9809,11 @@ function dol_eval($s, $returnvalue = 0, $hideerrors = 1, $onlysimplestring = '1'
|
|||
$error = 'dol_eval try/catch error : ';
|
||||
$error .= $e->getMessage();
|
||||
dol_syslog($error, LOG_WARNING);
|
||||
if ($returnvalue) {
|
||||
return 'Exception during evaluation: '.$s;
|
||||
} else {
|
||||
return '';
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -916,6 +916,7 @@ class Project extends CommonObject
|
|||
} else {
|
||||
dol_print_error($this->db);
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -245,7 +245,7 @@ class FormWebPortal extends Form
|
|||
* @param string $filedir Full path to directory to scan
|
||||
* @param string $filter Filter filenames on this regex string (Example: '\.pdf$')
|
||||
* @param string $morecss Add more css to the download picto
|
||||
* @param string $allfiles 0=Only generated docs, 1=All files
|
||||
* @param int $allfiles 0=Only generated docs, 1=All files
|
||||
* @return string Output string with HTML link of documents (might be empty string). This also fill the array ->infofiles
|
||||
*/
|
||||
public function getDocumentsLink($modulepart, $modulesubdir, $filedir, $filter = '', $morecss = '', $allfiles = 0)
|
||||
|
|
|
|||
Loading…
Reference in a new issue