Merge pull request #665 from FHenry/develop

Fix mass mailing tabs regression
This commit is contained in:
Laurent Destailleur 2013-02-18 07:46:07 -08:00
commit 4119fde0e5

View File

@ -31,12 +31,6 @@ function emailing_prepare_head($object)
{
global $user, $langs, $conf;
// Show more tabs from modules
// Entries must be declared in modules descriptor with line
// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab
// $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to remove a tab
complete_head_from_modules($conf,$langs,$object,$head,$h,'emailing');
$h = 0;
$head = array();
@ -58,6 +52,8 @@ function emailing_prepare_head($object)
$head[$h][1] = $langs->trans("Info");
$head[$h][2] = 'info';
$h++;
complete_head_from_modules($conf,$langs,$object,$head,$h,'emailing');
complete_head_from_modules($conf,$langs,$object,$head,$h,'emailing','remove');