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

fix merge

Browse Source
This commit is contained in:
Frédéric FRANCE 2019-09-30 19:36:57 +02:00
parent b87610adcc
commit f32f528bc2
No known key found for this signature in database
GPG Key ID: 06809324E4B2ABC1
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3160,13 +3160,8 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
elseif ($pictowithouttext == 'jabber') { elseif ($pictowithouttext == 'jabber') {
$fakey = 'fa-comment-o'; $fakey = 'fa-comment-o';
} }
<<<<<<< HEAD elseif (in_array($pictowithouttext, array('skype', 'twitter', 'facebook', 'linkedin', 'instagram','snapchat','youtube','google-plus-g','whatsapp'))) {
elseif (in_array($pictowithoutext, array('skype', 'twitter', 'facebook', 'linkedin', 'instagram','snapchat','youtube','google-plus-g','whatsapp'))) {
$fakey = 'fa-'.$pictowithoutext;
=======
elseif (in_array($pictowithouttext, array('skype', 'twitter', 'facebook', 'linkedin'))) {
$fakey = 'fa-'.$pictowithouttext; $fakey = 'fa-'.$pictowithouttext;
>>>>>>> upstream/develop
if (empty($conf->global->MAIN_DISABLE_FONT_AWESOME_5)) $fa = 'fab'; if (empty($conf->global->MAIN_DISABLE_FONT_AWESOME_5)) $fa = 'fab';
} }
// Img for type of views // Img for type of views