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

Merge branch 'Fix_dolGetButtonAction' of github.com:atm-GregM/dolibarr into updateButtonsGregM

Browse Source
This commit is contained in:
GregM 2022-02-23 15:37:36 +01:00
commit 6a8b20b3c0
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/core/lib/functions.lib.php
View File

@ -9954,7 +9954,7 @@ function dolGetButtonAction($label, $html = '', $actionType = 'default', $url =
$class = 'butAction'; $class = 'butAction';
if ($actionType == 'danger' || $actionType == 'delete') { if ($actionType == 'danger' || $actionType == 'delete') {
$class = 'butActionDelete'; $class = 'butActionDelete';
if (strpos($url, 'token=') === false) $url .= '&token='.newToken(); if (!empty($url) && strpos($url, 'token=') === false) $url .= '&token='.newToken();
} }
$attr = array( $attr = array(
@ -9965,6 +9965,7 @@ function dolGetButtonAction($label, $html = '', $actionType = 'default', $url =
if (empty($html)) { if (empty($html)) {
$html = $label; $html = $label;
$attr['title'] = ''; // if html not set, leave label on title is redundant
} else { } else {
$attr['aria-label'] = $label; $attr['aria-label'] = $label;
} }