Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

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

Browse Source 
Conflicts:
	htdocs/core/class/html.formfile.class.php
	htdocs/core/lib/files.lib.php
	htdocs/core/tpl/filemanager.tpl.php
This commit is contained in:
Laurent Destailleur
2020-05-27 14:28:20 +02:00
parent e308170ed8 3ef1ca1764
commit 16625af34e
17 changed files with 91 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/ajax/ajaxdirpreview.php
View File

@@ -343,7 +343,7 @@ if ($useajax || $action == 'delete')
$section_id = $section;
require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
$useglobalvars = 1;
$form = new Form($db);
$formquestion['urlfile'] = array('type'=>'hidden', 'value'=>$urlfile, 'name'=>'urlfile'); // We must always put field, even if empty because it is filled by javascript later
$formquestion['section'] = array('type'=>'hidden', 'value'=>$section, 'name'=>'section'); // We must always put field, even if empty because it is filled by javascript later