diff --git a/inc/Menu/Item/AbstractItem.php b/inc/Menu/Item/AbstractItem.php index e943b590067dc0f56161a1ae0f6c23e15de03ae7..45ead5562e564e91eb84f34dfa229969e74e92e7 100644 --- a/inc/Menu/Item/AbstractItem.php +++ b/inc/Menu/Item/AbstractItem.php @@ -182,7 +182,7 @@ abstract class AbstractItem { $this->method, $this->getTitle(), $this->getLabel(), - inlineSVG($this->getSvg()) + $this->getSvg() ); } diff --git a/inc/html.php b/inc/html.php index cebff851e2a27d0bd0a28800535c98201ea6fa41..99b0c99865bc5a4830937d4e93a12f464666ef8f 100644 --- a/inc/html.php +++ b/inc/html.php @@ -188,10 +188,10 @@ function html_topbtn(){ * @param string $method * @param string $tooltip * @param bool|string $label label text, false: lookup btn_$name in localization - * @param string $inlineSVG (optional) inlineSVG code, inserted into the button + * @param string $svg (optional) svg code, inserted into the button * @return string */ -function html_btn($name, $id, $akey, $params, $method='get', $tooltip='', $label=false, $inlineSVG=null){ +function html_btn($name, $id, $akey, $params, $method='get', $tooltip='', $label=false, $svg=null){ global $conf; global $lang; @@ -234,9 +234,9 @@ function html_btn($name, $id, $akey, $params, $method='get', $tooltip='', $label $ret .= 'accesskey="'.$akey.'" '; } $ret .= 'title="'.$tip.'">'; - if ($inlineSVG) { + if ($svg) { $ret .= '<span>' . hsc($label) . '</span>'; - $ret .= $inlineSVG; + $ret .= inlineSVG($svg); } else { $ret .= hsc($label); }