Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

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

Browse Source
This commit is contained in:
Laurent Destailleur
2020-01-28 17:24:33 +01:00
parent 80707d6a5e d1f3e5b1c2
commit ff3a7a45cc
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
htdocs/core/class/html.form.class.php
View File

@@ -7297,13 +7297,22 @@ class Form
{ {
$ret .= ''; $ret .= '';
} }
elseif ($fieldref != 'none') $ret .= dol_htmlentities($object->$fieldref); elseif ($fieldref != 'none')
{
$ret.=dol_htmlentities($object->$fieldref);
}
if ($morehtmlref) if ($morehtmlref)
{ {
$ret .= ' '.$morehtmlref; // don't add a additional space, when "$morehtmlref" starts with a HTML div tag
if(substr($morehtmlref, 0, 4) != '<div')
{
$ret.=' ';
} }
$ret.=$morehtmlref;
}
$ret.='</div>'; $ret.='</div>';
$ret .= '</div><!-- End banner content -->'; $ret .= '</div><!-- End banner content -->';