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

FIX Delete file on smartphone

Browse Source
This commit is contained in:
Laurent Destailleur 2018-08-19 03:00:11 +02:00
parent 547a0aaac7
commit 795b2f3d58
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -778,7 +778,8 @@ class FormFile
$out.= '<td class="right nowraponall">'; $out.= '<td class="right nowraponall">';
if ($delallowed) if ($delallowed)
{ {
$out.= '<a href="'.$urlsource.(strpos($urlsource,'?')?'&amp;':'?').'action=remove_file&amp;file='.urlencode($relativepath); $tmpurlsource = preg_replace('/#[a-zA-Z0-9_]*$/', '', $urlsource);
$out.= '<a href="'.$tmpurlsource.(strpos($tmpurlsource,'?')?'&amp;':'?').'action=remove_file&amp;file='.urlencode($relativepath);
$out.= ($param?'&amp;'.$param:''); $out.= ($param?'&amp;'.$param:'');
//$out.= '&modulepart='.$modulepart; // TODO obsolete ? //$out.= '&modulepart='.$modulepart; // TODO obsolete ?
//$out.= '&urlsource='.urlencode($urlsource); // TODO obsolete ? //$out.= '&urlsource='.urlencode($urlsource); // TODO obsolete ?
@ -814,7 +815,7 @@ class FormFile
$this->numoffiles++; $this->numoffiles++;
} }
// Loop on each file found // Loop on each link found
if (is_array($link_list)) if (is_array($link_list))
{ {
$colspan=2; $colspan=2;
@ -1304,8 +1305,7 @@ class FormFile
if (! empty($conf->dol_use_jmobile)) $useajax=0; if (! empty($conf->dol_use_jmobile)) $useajax=0;
if (empty($conf->use_javascript_ajax)) $useajax=0; if (empty($conf->use_javascript_ajax)) $useajax=0;
if (! empty($conf->global->MAIN_ECM_DISABLE_JS)) $useajax=0; if (! empty($conf->global->MAIN_ECM_DISABLE_JS)) $useajax=0;
print '<a href="'.(($useinecm && $useajax)?'#':($url.'?action=delete&urlfile='.urlencode($filepath).$param)).'" class="deletefilelink" rel="'.$filepath.'">'.img_delete().'</a>';
print '<a href="'.(($useinecm && $useajax)?'#':$url.'?action=delete&urlfile='.urlencode($filepath).$param).'" class="deletefilelink" rel="'.$filepath.'">'.img_delete().'</a>';
} }
print "</td>"; print "</td>";