lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX Bad position of hook formattachOptions call

Browse Source
This commit is contained in:
Laurent Destailleur 2018-09-24 15:13:18 +02:00
parent 5c0e6eacf6
commit eeda176ed6
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/core/class/html.formfile.class.php
View File

@ -185,7 +185,7 @@ class FormFile
if ($linkfiles) if ($linkfiles)
{ {
$out .= "\n<!-- Start form attach new link -->\n"; $out .= "\n<!-- Start form link new url -->\n";
$langs->load('link'); $langs->load('link');
$title = $langs->trans("LinkANewFile"); $title = $langs->trans("LinkANewFile");
$out .= load_fiche_titre($title, null, null); $out .= load_fiche_titre($title, null, null);
@ -213,19 +213,18 @@ class FormFile
$out .= '</div>'; $out .= '</div>';
$out .= '<div class="clearboth"></div>'; $out .= '<div class="clearboth"></div>';
$out .= '</form><br>'; $out .= '</form><br>';
$parameters = array('socid'=>(isset($GLOBALS['socid'])?$GLOBALS['socid']:''),'id'=>(isset($GLOBALS['id'])?$GLOBALS['id']:''), 'url'=>$url, 'perm'=>$perm);
$res = $hookmanager->executeHooks('formattachOptions',$parameters,$object);
$out .= "\n<!-- End form attach new file -->\n"; $out .= "\n<!-- End form link new url -->\n";
} }
$parameters = array('socid'=>(isset($GLOBALS['socid'])?$GLOBALS['socid']:''), 'id'=>(isset($GLOBALS['id'])?$GLOBALS['id']:''), 'url'=>$url, 'perm'=>$perm);
$res = $hookmanager->executeHooks('formattachOptions',$parameters,$object);
if (empty($res)) if (empty($res))
{ {
print '<div class="attacharea attacharea'.$htmlname.'">'; print '<div class="attacharea attacharea'.$htmlname.'">';
print $out; print $out;
print '</div>'; print '</div>';
} }
print $hookmanager->resPrint; print $hookmanager->resPrint;
return 1; return 1;