Merge branch 'develop' into fix-phpstan-no-langs

Hystepik · Oct 3, 2024 · ae542c7 · ae542c7
2 parents 7daf086 + 2d4ea67
commit ae542c7
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
@@ -2596,7 +2596,7 @@ function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab
 	// Show tabs
 	// if =0 we don't use the feature
 	if (empty($limittoshow)) {
-		$limittoshow = (!getDolGlobalString('MAIN_MAXTABS_IN_CARD') ? 99 : $conf->global->MAIN_MAXTABS_IN_CARD);
+		$limittoshow = getDolGlobalInt('MAIN_MAXTABS_IN_CARD', 99);
 	}
 	if (!empty($conf->dol_optimize_smallscreen)) {
 		$limittoshow = 2;
@@ -2641,7 +2641,7 @@ function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab
 					$out .= '<a'.(!empty($links[$i][2]) ? ' id="'.$links[$i][2].'"' : '').' class="tab inline-block valignmiddle'.($morecss ? ' '.$morecss : '').(!empty($links[$i][5]) ? ' '.$links[$i][5] : '').'" href="'.$links[$i][0].'" title="'.dol_escape_htmltag($titletoshow).'">';
 				}
 
-				if ($displaytab == 0) {
+				if ($displaytab == 0 && $picto) {
 					$out .= img_picto($title, $picto, '', $pictoisfullpath, 0, 0, '', 'imgTabTitle paddingright marginrightonlyshort');
 				}