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

Taking account remark

Browse Source 
1f5ebb594a
This commit is contained in:
fhenry 2013-03-16 17:01:17 +01:00
parent cf21b32eb1
commit 07bc0cd09e
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/user/class/user.class.php
View File

@ -201,11 +201,7 @@ class User extends CommonObject
$this->user_mobile = $obj->user_mobile;
$this->email = $obj->email;
$this->job = $obj->job;
if (!empty($conf->global->FCKEDITOR_ENABLE_USERSIGN) && dol_textishtml(dol_html_entity_decode($obj->signature, ENT_COMPAT | ENT_HTML401))) {
$this->signature = dol_html_entity_decode($obj->signature, ENT_COMPAT | ENT_HTML401);
}else {
$this->signature = $obj->signature;
}
$this->signature = $obj->signature;
$this->admin = $obj->admin;
$this->note = $obj->note;
$this->statut = $obj->statut;

6
htdocs/user/fiche.php
View File

@ -1205,7 +1205,11 @@ else
// Signature
print '<tr><td valign="top">'.$langs->trans('Signature').'</td><td>';
print dol_textishtml($object->signature)?$object->signature:dol_nl2br($object->signature,1,false);
if (!empty($conf->global->FCKEDITOR_ENABLE_USERSIGN) && dol_textishtml(dol_html_entity_decode($object->signature, ENT_COMPAT | ENT_HTML401))) {
print dol_html_entity_decode($object->signature, ENT_COMPAT | ENT_HTML401);
}else {
print dol_nl2br($object->signature,1,false);
}
print "</td></tr>\n";
// Hierarchy