Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
This commit is contained in:
commit
2f5c190060
@ -122,6 +122,8 @@ if (! empty($conf->hrm->enabled) && ! empty($conf->global->MAIN_SEARCHFORM_EMPLO
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
// Execute hook addSearchEntry
|
// Execute hook addSearchEntry
|
||||||
|
$hookmanager->initHooks(array('searchform','leftblock'));
|
||||||
|
|
||||||
$parameters=array();
|
$parameters=array();
|
||||||
$reshook=$hookmanager->executeHooks('addSearchEntry',$parameters);
|
$reshook=$hookmanager->executeHooks('addSearchEntry',$parameters);
|
||||||
if (empty($reshook))
|
if (empty($reshook))
|
||||||
@ -132,12 +134,6 @@ else $arrayresult=$hookmanager->resArray;
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
print json_encode($arrayresult);
|
print json_encode($arrayresult);
|
||||||
|
|
||||||
if (is_object($db)) $db->close();
|
if (is_object($db)) $db->close();
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user