Skip to content

Commit c82194a

Browse files
committed
Correct bug in easyIcon when title is not a string.
1 parent a0d4ab7 commit c82194a

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/View/Helper/BootstrapPaginatorHelper.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ public function next ($title = 'Next >>', array $options = []) {
185185
}
186186

187187
public function first($first = '<< first', array $options = []) {
188-
return $this->_easyIcon('parent::first', first, $options);
188+
return $this->_easyIcon('parent::first', $first, $options);
189189
}
190190

191191
public function last($last = 'last >>', array $options = []) {

src/View/Helper/BootstrapTrait.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ protected function _extractType ($options, $key = 'type', $default = 'info',
143143
**/
144144
protected function _makeIcon ($title, &$converted = false) {
145145
$converted = false ;
146-
if (!$this->easyIcon) {
146+
if (!$this->easyIcon || !is_string($title)) {
147147
return $title ;
148148
}
149149
$title = preg_replace_callback('#(^|\s+)i:([a-zA-Z0-9\\-_]+)(\s+|$)#', function ($matches) {

0 commit comments

Comments
 (0)