diff --git a/dev/setup/codesniffer/ruleset.xml b/dev/setup/codesniffer/ruleset.xml index bf283993628..db4945a654c 100644 --- a/dev/setup/codesniffer/ruleset.xml +++ b/dev/setup/codesniffer/ruleset.xml @@ -6,7 +6,7 @@ build/html build/aps - dev/namespacemig + dev/tools/test/namespacemig dev/initdata/dbf/includes documents htdocs/core/class/lessc.class.php diff --git a/htdocs/admin/sms.php b/htdocs/admin/sms.php index 9b333d7b4f1..d2cf26a0c9a 100644 --- a/htdocs/admin/sms.php +++ b/htdocs/admin/sms.php @@ -161,7 +161,6 @@ if (!count($listofmethods)) { } if ($action == 'edit') { - print '
'; print ''; print ''; diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php index 713f3132eaf..eccc22de899 100644 --- a/htdocs/install/fileconf.php +++ b/htdocs/install/fileconf.php @@ -408,13 +408,13 @@ if (!empty($force_install_noedit)) { id="db_pass" autocomplete="off" name="db_pass" value="" + // If $force_install_databasepass is on, we don't want to set password, we just show '***'. Real value will be extracted from the forced install file at step1. + $autofill = ((!empty($_SESSION['dol_save_pass'])) ? $_SESSION['dol_save_pass'] : str_pad('', strlen($force_install_databasepass), '*')); + if (!empty($dolibarr_main_prod)) { + $autofill = ''; + } + print dol_escape_htmltag($autofill); + ?>" >