Merge branch '20.0' of [email protected]:Dolibarr/dolibarr.git into develop

DaBootO · Jul 11, 2024 · e3d8586 · e3d8586
2 parents 7661b87 + 07483c9
commit e3d8586
Show file tree

Hide file tree

Showing 3 changed files with 351 additions and 342 deletions.
diff --git a/htdocs/admin/system/security.php b/htdocs/admin/system/security.php
@@ -190,10 +190,10 @@
 print '<strong>JSON</strong>: ';
 $loadedExtensions    = array_map('strtolower', get_loaded_extensions(false));
 $test = !in_array('json', $loadedExtensions);
-if ($test) {
+if ($test || function_exists('dol_json_decode')) {
 	print img_picto('', 'error').' '.$langs->trans("NotInstalled").' - '.$langs->trans("VulnerableToRCEAttack");
 } else {
-	print img_picto('', 'tick').' '.$langs->trans("Available");
+	print img_picto('', 'tick').' '.$langs->trans("Available").' <span class="opacitymedium">(PHP native so not emulated, safe)</span>';
 }
 print '<br>';