Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

This commit is contained in:
Laurent Destailleur 2015-09-04 18:35:32 +02:00
commit 62a1d1c4a2

View File

@ -1619,7 +1619,9 @@ else
* Hotbar * Hotbar
*/ */
print '<div class="tabsAction">'; print '<div class="tabsAction">';
$parameters = array();
$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been
if (empty($reshook)) {
if ($action != 'valid' && $action != 'editlogin' && $action != 'editthirdparty') if ($action != 'valid' && $action != 'editlogin' && $action != 'editthirdparty')
{ {
// Modify // Modify
@ -1743,7 +1745,7 @@ else
} }
} }
}
print '</div>'; print '</div>';
if ($isinspip == -1) if ($isinspip == -1)