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

Merge remote-tracking branch 'upstream/develop' into socialnetworks

Browse Source
This commit is contained in:
Frédéric FRANCE
2019-10-12 21:16:54 +02:00
parent d9ba09bec1 33f6206031
commit c143584af4
2 changed files with 62 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/core/lib/functions.lib.php
View File

@@ -3162,7 +3162,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
$marginleftonlyshort=0;
}
elseif ($pictowithouttext == 'unlink') {
$fakey = 'fa-chain-broken';
$fakey = 'fa-unlink';
$facolor = '#555';
}
elseif ($pictowithouttext == 'playdisabled') {
@@ -3196,6 +3196,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
//$facolor = '#444';
$marginleftonlyshort=0;
}
//this snippet only needed since function img_edit accepts only one additional parameter: no separate one for css only.
//class/style need to be extracted to avoid duplicate class/style validation errors when $moreatt is added to the end of the attributes
$reg=array();