From 196cf53dbd133f5dce181551bc591b0cda064ecf Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 25 Apr 2014 20:11:38 +0200 Subject: [PATCH] Fix: Pb of return values --- htdocs/core/menus/standard/auguria.lib.php | 6 ++++-- htdocs/core/menus/standard/eldy.lib.php | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php index c395b775937..f668c85a1f8 100644 --- a/htdocs/core/menus/standard/auguria.lib.php +++ b/htdocs/core/menus/standard/auguria.lib.php @@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php'; * @param array &$tabMenu If array with menu entries already loaded, we put this array here (in most cases, it's empty) * @param array &$menu Object Menu to return back list of menu entries * @param int $noout Disable output (Initialise &$menu only). - * @return void + * @return int 0 */ function print_auguria_menu($db,$atarget,$type_user,&$tabMenu,&$menu,$noout=0) { @@ -97,6 +97,8 @@ function print_auguria_menu($db,$atarget,$type_user,&$tabMenu,&$menu,$noout=0) if (empty($noout)) print_end_menu_array_auguria(); print "\n"; + + return 0; } @@ -206,7 +208,7 @@ function print_end_menu_array_auguria() * @param int $noout Disable output (Initialise &$menu only). * @param string $forcemainmenu 'x'=Force mainmenu to mainmenu='x' * @param string $forceleftmenu 'all'=Force leftmenu to '' (= all) - * @return void + * @return int Nb of entries */ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabMenu,&$menu,$noout=0,$forcemainmenu='',$forceleftmenu='') { diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index 0088de9955c..cdcb94d31ab 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -35,7 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php'; * @param array &$tabMenu If array with menu entries already loaded, we put this array here (in most cases, it's empty) * @param array &$menu Object Menu to return back list of menu entries * @param int $noout Disable output (Initialise &$menu only). - * @return void + * @return int 0 */ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu,&$menu,$noout=0) { @@ -322,6 +322,8 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu,&$menu,$noout=0) if (empty($noout)) print_end_menu_entry($showmode); if (empty($noout)) print_end_menu_array(); + + return 0; } @@ -431,7 +433,7 @@ function print_end_menu_array() * @param int $noout Disable output (Initialise &$menu only). * @param string $forcemainmenu 'x'=Force mainmenu to mainmenu='x' * @param string $forceleftmenu 'all'=Force leftmenu to '' (= all) - * @return void + * @return int nb of menu entries */ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu,&$menu,$noout=0,$forcemainmenu='',$forceleftmenu='') {