Merge remote-tracking branch 'origin/3.7' into develop

Conflicts: ChangeLog
2026-01-04 16:12:39 +01:00 · 2014-12-26 04:57:55 +01:00
parent 3a7bd794a5 657fc1b91c
commit 5ead994955
55 changed files with 328 additions and 162 deletions
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2653,10 +2653,11 @@ function getTitleFieldOfList($name, $thead=0, $file="", $field="", $begin="", $m
 }

 /**
- *	Show a title (deprecated. use print_fiche_titre instead)
+ *	Show a title.
 *
 *	@param	string	$title			Title to show
 *	@return	string					Title to show
+ *  @deprecated						Use print_fiche_titre instead
 */
 function print_titre($title)
 {