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

Fix warnings

Browse Source
This commit is contained in:
Laurent Destailleur
2023-11-06 20:08:27 +01:00
parent 9ef047e75e
commit 75ac561595
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4314,6 +4314,10 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
$url = DOL_URL_ROOT; $url = DOL_URL_ROOT;
$theme = isset($conf->theme) ? $conf->theme : null; $theme = isset($conf->theme) ? $conf->theme : null;
$path = 'theme/'.$theme; $path = 'theme/'.$theme;
if (empty($picto)) {
$picto = 'generic';
}
// Define fullpathpicto to use into src // Define fullpathpicto to use into src
if ($pictoisfullpath) { if ($pictoisfullpath) {
// Clean parameters // Clean parameters
@@ -4327,7 +4331,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
$moreatt = str_replace('class="'.$reg[1].'"', '', $moreatt); $moreatt = str_replace('class="'.$reg[1].'"', '', $moreatt);
} }
} else { } else {
$pictowithouttext = preg_replace('/(\.png|\.gif|\.svg)$/', '', $picto); $pictowithouttext = preg_replace('/(\.png|\.gif|\.svg)$/', '', (is_null($picto) ? '' : $picto));
$pictowithouttext = str_replace('object_', '', $pictowithouttext); $pictowithouttext = str_replace('object_', '', $pictowithouttext);
$pictowithouttext = str_replace('_nocolor', '', $pictowithouttext); $pictowithouttext = str_replace('_nocolor', '', $pictowithouttext);