diff --git a/htdocs/admin/system/perf.php b/htdocs/admin/system/perf.php
index 6d7ef8f1863..d9affa9684f 100644
--- a/htdocs/admin/system/perf.php
+++ b/htdocs/admin/system/perf.php
@@ -50,8 +50,13 @@ llxHeader();
print load_fiche_titre($langs->trans("PerfDolibarr"), '', 'title_setup');
-print ''.$langs->trans("YouMayFindPerfAdviceHere", 'https://wiki.dolibarr.org/index.php/FAQ_Increase_Performance').' ('.$langs->trans("Reload").')
';
-
+print ''.$langs->trans("YouMayFindPerfAdviceHere", 'https://wiki.dolibarr.org/index.php/FAQ_Increase_Performance').'';
+print ' ';
+print '';
+print img_picto($langs->trans("Reload"), 'refresh').' ';
+print $langs->trans("Reload");
+print '';
+print '
';
print '
';
print '
';
diff --git a/htdocs/admin/system/security.php b/htdocs/admin/system/security.php
index cab41cc6263..c23bdb3051f 100644
--- a/htdocs/admin/system/security.php
+++ b/htdocs/admin/system/security.php
@@ -41,7 +41,7 @@ if (GETPOST('action', 'aZ09') == 'donothing') {
exit;
}
-$execmethod = empty($conf->global->MAIN_EXEC_USE_POPEN) ? 1 : $conf->global->MAIN_EXEC_USE_POPEN;
+$execmethod = getDolGlobalInt('MAIN_EXEC_USE_POPEN', 1);
/*
@@ -52,7 +52,13 @@ llxHeader();
print load_fiche_titre($langs->trans("Security"), '', 'title_setup');
-print ''.$langs->trans("YouMayFindSecurityAdviceHere", 'hhttps://wiki.dolibarr.org/index.php/Security_information').' ('.$langs->trans("Reload").')
';
+print ''.$langs->trans("YouMayFindSecurityAdviceHere", 'hhttps://wiki.dolibarr.org/index.php/Security_information').'';
+print ' ';
+print '';
+print img_picto($langs->trans("Reload"), 'refresh').' ';
+print $langs->trans("Reload");
+print '';
+print '
';
print '
';
print load_fiche_titre($langs->trans("PHPSetup"), '', 'folder');
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 62176a37c41..ead160f3a09 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -2224,12 +2224,12 @@ MailToPartnership=Partnership
AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
YouShouldDisablePHPFunctions=You should disable PHP functions
IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands in custom code, you shoud disable PHP functions
-PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
+PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an antivirus program), you must keep PHP functions
NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
RecommendedValueIs=Recommended: %s
Recommended=Recommended
NotRecommended=Not recommended
-ARestrictedPath=Some restricted path
+ARestrictedPath=Some restricted path for data files
CheckForModuleUpdate=Check for external modules updates
CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
ModuleUpdateAvailable=An update is available
diff --git a/htdocs/user/hierarchy.php b/htdocs/user/hierarchy.php
index 44ab46193d9..ce18b9d5011 100644
--- a/htdocs/user/hierarchy.php
+++ b/htdocs/user/hierarchy.php
@@ -42,6 +42,9 @@ if ($user->socid > 0) {
$optioncss = GETPOST('optioncss', 'alpha');
$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'userlist'; // To manage different context of search
$mode = GETPOST("mode", 'alpha');
+if (empty($mode)) {
+ $mode = 'hierarchy';
+}
$sortfield = GETPOST('sortfield', 'aZ09comma');
$sortorder = GETPOST('sortorder', 'aZ09comma');