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

Fix: should not change var $html here. It is not class

Browse Source 
html.form.class.php
This commit is contained in:
Laurent Destailleur 2011-11-16 23:58:25 +01:00
parent 36c8bbdf3c
commit 9fcff390cd
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/core/class/CMailFile.class.php
View File

@ -63,10 +63,10 @@ class CMailFile
var $bodyCSS; var $bodyCSS;
// Image // Image
var $form; var $html;
var $image_boundary; var $image_boundary;
var $atleastoneimage=0; var $atleastoneimage=0;
var $form_images=array(); var $html_images=array();
var $images_encoded=array(); var $images_encoded=array();
var $image_types = array('gif' => 'image/gif', var $image_types = array('gif' => 'image/gif',
'jpg' => 'image/jpeg', 'jpg' => 'image/jpeg',
@ -137,6 +137,7 @@ class CMailFile
{ {
$this->html = $msg; $this->html = $msg;
$findimg = $this->findHtmlImages($conf->fckeditor->dir_output); $findimg = $this->findHtmlImages($conf->fckeditor->dir_output);
// Define if there is at least one file // Define if there is at least one file
if ($findimg) if ($findimg)
{ {
@ -857,6 +858,7 @@ class CMailFile
// Build the list of image extensions // Build the list of image extensions
$extensions = array_keys($this->image_types); $extensions = array_keys($this->image_types);
preg_match_all('/(?:"|\')([^"\']+\.('.implode('|', $extensions).'))(?:"|\')/Ui', $this->html, $matches); preg_match_all('/(?:"|\')([^"\']+\.('.implode('|', $extensions).'))(?:"|\')/Ui', $this->html, $matches);
if ($matches) if ($matches)