diff --git a/htdocs/admin/export.php b/htdocs/admin/export.php index c4ad077296a..cb97502c3f8 100644 --- a/htdocs/admin/export.php +++ b/htdocs/admin/export.php @@ -57,7 +57,7 @@ llxHeader('', $langs->trans($page_name)); // Subheader $linkback = '' . $langs->trans("BackToModuleList") . ''; -print_fiche_titre($langs->trans($page_name), $linkback); +print load_fiche_titre($langs->trans($page_name), $linkback); // Configuration header diff --git a/htdocs/admin/ticket.php b/htdocs/admin/ticket.php index 5cf72b302c9..86f6250cede 100644 --- a/htdocs/admin/ticket.php +++ b/htdocs/admin/ticket.php @@ -253,7 +253,7 @@ dol_fiche_end(); * Projects Numbering model */ -print_titre($langs->trans("TicketNumberingModules")); +print load_fiche_titre($langs->trans("TicketNumberingModules")); print ''; print ''; @@ -353,7 +353,7 @@ if (!$conf->use_javascript_ajax) { print ''; print ''; } -print_titre($langs->trans("TicketParamPublicInterface")); +print load_fiche_titre($langs->trans("TicketParamPublicInterface")); print '
'; @@ -422,7 +422,7 @@ print ''; print '

'; -print_titre($langs->trans("TicketParams")); +print load_fiche_titre($langs->trans("TicketParams")); print ''; // Activate email notifications @@ -515,7 +515,7 @@ if (!$conf->use_javascript_ajax) { } // Admin var of module -print_titre($langs->trans("TicketParamMail")); +print load_fiche_titre($langs->trans("TicketParamMail")); print '
'; diff --git a/htdocs/admin/ticket_extrafields.php b/htdocs/admin/ticket_extrafields.php index 6fa70808ec8..f63af3d2a82 100644 --- a/htdocs/admin/ticket_extrafields.php +++ b/htdocs/admin/ticket_extrafields.php @@ -92,7 +92,7 @@ if ($action != 'create' && $action != 'edit') { if ($action == 'create') { print "
"; - print_titre($langs->trans('NewAttribute')); + print load_fiche_titre($langs->trans('NewAttribute')); include DOL_DOCUMENT_ROOT . '/core/tpl/admin_extrafields_add.tpl.php'; } @@ -104,7 +104,7 @@ if ($action == 'create') { /* ************************************************************************** */ if ($action == 'edit' && !empty($attrname)) { print "
"; - print_titre($langs->trans("FieldEdition", $attrname)); + print load_fiche_titre($langs->trans("FieldEdition", $attrname)); include DOL_DOCUMENT_ROOT . '/core/tpl/admin_extrafields_edit.tpl.php'; } diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php index f0188c5ed94..86e963e50df 100644 --- a/htdocs/compta/charges/index.php +++ b/htdocs/compta/charges/index.php @@ -463,7 +463,7 @@ if (! empty($conf->salaries->enabled) && ! empty($user->rights->salaries->read)) print "
"; - print_fiche_titre( $langs->trans("SalariesPayments").($year?' ('.$langs->trans("Year").' '.$year.')':''), '', ''); + print load_fiche_titre( $langs->trans("SalariesPayments").($year?' ('.$langs->trans("Year").' '.$year.')':''), '', ''); $sql = "SELECT s.rowid, s.amount, s.label, s.datep as datep, s.datev as datev, s.datesp, s.dateep, s.salary, s.fk_bank, u.salary as current_salary,"; $sql.= " pct.code as payment_code,"; diff --git a/htdocs/compta/sociales/payments.php b/htdocs/compta/sociales/payments.php index 936c2c9c0f2..8dc443aee6b 100644 --- a/htdocs/compta/sociales/payments.php +++ b/htdocs/compta/sociales/payments.php @@ -405,7 +405,7 @@ if (! empty($conf->salaries->enabled) && ! empty($user->rights->salaries->read)) print "
"; - print_fiche_titre($langs->trans("SalariesPayments").($year?' ('.$langs->trans("Year").' '.$year.')':''), '', ''); + print load_fiche_titre($langs->trans("SalariesPayments").($year?' ('.$langs->trans("Year").' '.$year.')':''), '', ''); $sql = "SELECT s.rowid, s.amount, s.label, s.datep as datep, s.datev as datev, s.datesp, s.dateep, s.salary, u.salary as current_salary"; $sql.= " FROM ".MAIN_DB_PREFIX."payment_salary as s, ".MAIN_DB_PREFIX."user as u"; diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php index c40710ceb56..50c6b1e1b50 100644 --- a/htdocs/contact/card.php +++ b/htdocs/contact/card.php @@ -682,7 +682,7 @@ else // Jabber if (! empty($conf->global->SOCIALNETWORKS_JABBER)) { - print ''; + print ''; print ''; } // Skype @@ -968,7 +968,7 @@ else // Jabber ID if (! empty($conf->global->SOCIALNETWORKS_JABBER)) { - print ''; + print ''; print ''; } // Skype diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index d7d896f023c..99d6d377f9c 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -39,48 +39,6 @@ include_once DOL_DOCUMENT_ROOT .'/core/lib/json.lib.php'; -/** - * Function to return value of a static property when class - * name is dynamically defined (not hard coded). - * This is because $myclass::$myvar works from PHP 5.3.0+ only - * - * @param string $class Class name - * @param string $member Name of property - * @return mixed Return value of static property - * @deprecated Dolibarr now requires 5.3.0+, use $class::$property syntax - * @see https://php.net/manual/language.oop5.static.php - */ -function getStaticMember($class, $member) -{ - dol_syslog(__FUNCTION__ . " is deprecated", LOG_WARNING); - - // This part is deprecated. Uncomment if for php 5.2.*, and comment next isset class::member - /*if (version_compare(phpversion(), '5.3.0', '<')) - { - if (is_object($class)) $class = get_class($class); - $classObj = new ReflectionClass($class); - $result = null; - - $found=0; - foreach($classObj->getStaticProperties() as $prop => $value) - { - if ($prop == $member) - { - $result = $value; - $found++; - break; - } - } - - if ($found) return $result; - }*/ - - if (isset($class::$member)) return $class::$member; - dol_print_error('','Try to get a static member "'.$member.'" in class "'.$class.'" that does not exists or is not static.'); - return null; -} - - /** * Return a DoliDB instance (database handler). * diff --git a/htdocs/core/tpl/advtarget.tpl.php b/htdocs/core/tpl/advtarget.tpl.php index 15ab669bd9a..af8c99c3fc7 100644 --- a/htdocs/core/tpl/advtarget.tpl.php +++ b/htdocs/core/tpl/advtarget.tpl.php @@ -47,7 +47,7 @@ print ''; - print_fiche_titre($langs->trans("AdvTgtTitle")); + print load_fiche_titre($langs->trans("AdvTgtTitle")); print '
' . "\n"; print '
' . "\n"; @@ -520,7 +520,7 @@ print '
jabberid).'">
jabberid).'">