Merge pull request #6970 from atm-ph/fix_6944

Fix 6944 compatibility PHP7 and missing parameter to call delete func…
This commit is contained in:
Laurent Destailleur 2017-06-11 00:32:43 +02:00 committed by GitHub
commit 43eb080242
2 changed files with 3 additions and 2 deletions

View File

@ -531,9 +531,10 @@ class PaiementFourn extends Paiement
*
* @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto
* @param string $option Sur quoi pointe le lien
* @param string $mode 'withlistofinvoices'=Include list of invoices into tooltip
* @return string Chaine avec URL
*/
function getNomUrl($withpicto=0,$option='')
function getNomUrl($withpicto=0,$option='',$mode='withlistofinvoices')
{
global $langs;

View File

@ -218,7 +218,7 @@ if (empty($reshook))
{
$object->fetch($id);
$object->fetch_thirdparty();
$result=$object->delete($id);
$result=$object->delete($user);
if ($result > 0)
{
header('Location: list.php');