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

Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
philippe grand 2015-04-18 18:36:00 +02:00
commit 838329f3d9
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
htdocs/core/class/html.formmail.class.php
View File

@ -837,15 +837,15 @@ class FormMail extends Form
if ($resql) if ($resql)
{ {
$this->lines_model=array(); $this->lines_model=array();
while ($obj = $this->db->fetch_object($resql)) { while ($obj = $this->db->fetch_object($resql))
$line = new ModelMailLine(); {
$line = new ModelMail();
$line->id=$obj->rowid; $line->id=$obj->rowid;
$line->label=$obj->label; $line->label=$obj->label;
$line->topic=$obj->topic; $line->topic=$obj->topic;
$line->content=$obj->lacontentbel; $line->content=$obj->lacontentbel;
$line->lang=$obj->lang; $line->lang=$obj->lang;
$this->lines_model[]=$line; $this->lines_model[]=$line;
} }
$this->db->free($resql); $this->db->free($resql);
return $num; return $num;
@ -858,7 +858,10 @@ class FormMail extends Form
} }
} }
class ModelMailLine /**
* ModelMail
*/
class ModelMail
{ {
public $id; public $id;
public $label; public $label;