Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-20 08:21:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur
2024-09-05 12:40:15 +02:00
parent 78b344d779 c80d75c8b3
commit 1b16ae87e4
12 changed files with 161 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5935,7 +5935,7 @@ function info_admin($text, $infoonimgalt = 0, $nodiv = 0, $admin = '1', $morecss
*/
function dol_print_error($db = null, $error = '', $errors = null)
{
global $conf, $langs, $argv;
global $conf, $langs, $user, $argv;
global $dolibarr_main_prod;
$out = '';
@@ -5963,6 +5963,9 @@ function dol_print_error($db = null, $error = '', $errors = null)
if (isset($conf->global->MAIN_FEATURES_LEVEL)) {
$out .= "<b>".$langs->trans("LevelOfFeature").":</b> ".getDolGlobalInt('MAIN_FEATURES_LEVEL')."<br>\n";
}
if ($user instanceof User) {
$out .= "<b>".$langs->trans("Login").":</b> ".$user->login."<br>\n";
}
if (function_exists("phpversion")) {
$out .= "<b>".$langs->trans("PHP").":</b> ".phpversion()."<br>\n";
}