diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php index 5a4a6019e7f..d064a0b0a91 100644 --- a/htdocs/adherents/list.php +++ b/htdocs/adherents/list.php @@ -1037,7 +1037,7 @@ print $hookmanager->resPrint; // Date creation if (!empty($arrayfields['d.datec']['checked'])) { - print ''; + print ''; print '
'; print $form->selectDate($search_datec_start ? $search_datec_start : -1, 'search_datec_start_', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From')); print '
'; diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php index 6fcefbb5f9d..4b159e40015 100644 --- a/htdocs/admin/system/dolibarr.php +++ b/htdocs/admin/system/dolibarr.php @@ -26,15 +26,6 @@ // Load Dolibarr environment require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; - -' -@phan-var-force string $dolibarr_main_document_root_alt -'; /** * @var Conf $conf * @var DoliDB $db @@ -45,6 +36,14 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; * @var string $dolibarr_main_document_root_alt * @var string $conffile */ +' +@phan-var-force string $dolibarr_main_document_root_alt +'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; // Load translation files required by the page $langs->loadLangs(array("install", "other", "admin")); @@ -169,9 +168,15 @@ if (preg_match('/[a-z]+/i', $version)) { print ''."\n"; print ''.$langs->trans("VersionLastUpgrade").'
('.$langs->trans("Database").')'; -print ''.getDolGlobalString('MAIN_VERSION_LAST_UPGRADE').''."\n"; +if (getDolGlobalString('MAIN_VERSION_LAST_UPGRADE')) { + print ''.getDolGlobalString('MAIN_VERSION_LAST_UPGRADE').''; +} +print ''."\n"; print ''.$langs->trans("VersionLastInstall").'
('.$langs->trans("Database").')'; -print ''.getDolGlobalString('MAIN_VERSION_LAST_INSTALL').''."\n"; +if (getDolGlobalString('MAIN_VERSION_LAST_INSTALL')) { + print ''.getDolGlobalString('MAIN_VERSION_LAST_INSTALL').''; +} +print ''."\n"; print ''; print ''; print '
'; diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php index 2ddae91637a..75e691fe490 100644 --- a/htdocs/public/members/new.php +++ b/htdocs/public/members/new.php @@ -673,8 +673,8 @@ if (getDolGlobalString('MEMBER_SKIP_TABLE') || getDolGlobalString('MEMBER_NEWFOR print ''; print '
'; - $messagemandatory = ''.$langs->trans("FieldsWithAreMandatory", '*').''; - //print '
'.$langs->trans("FieldsWithAreMandatory", '*').'
'; + //$messagemandatory = ''.$langs->trans("FieldsWithAreMandatory", '*').''; + //print '
'.$messagemandatory.'
'; //print $langs->trans("FieldsWithIsForPublic",'**').'
'; print dol_get_fiche_head(); @@ -683,10 +683,12 @@ if (getDolGlobalString('MEMBER_SKIP_TABLE') || getDolGlobalString('MEMBER_NEWFOR print "\n".'"; print '