lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2794 from hregis/develop_origin

Browse Source 
Fix: add $object for use with triggers
This commit is contained in:
Laurent Destailleur 2015-05-11 23:02:41 +02:00
commit b2fa603f46
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/product/class/product.class.php
View File

@ -1,7 +1,7 @@
<?php
/* Copyright (C) 2001-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2014 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2014 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2005-2015 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2006 Andre Cianfarani <acianfa@free.fr>
* Copyright (C) 2007-2011 Jean Heimburger <jean@tiaris.info>
* Copyright (C) 2010-2013 Juanjo Menent <jmenent@2byte.es>
@ -70,9 +70,9 @@ class Product extends CommonObject
* @var string
*/
var $label;
/**
/**
* Product descripion
* @var string
* @var string
*/
var $description;
@ -3691,7 +3691,7 @@ class Product extends CommonObject
$filename = preg_replace('/'.preg_quote($dir,'/').'/i','',$file); // Nom du fichier
// On efface l'image d'origine
dol_delete_file($file);
dol_delete_file($file, 0, 0, 0, $this); // For triggers
// Si elle existe, on efface la vignette
if (preg_match('/('.$this->regeximgext.')$/i',$filename,$regs))