Skip to content

Commit 6c335a8

Browse files
authored
Merge pull request #4493 from Polfo/4.1
Fix `mb_strwidth()` Passing null to parameter 1 is deprecated #4492
2 parents 248e2e0 + 0184c7a commit 6c335a8

9 files changed

+9
-8
lines changed

src/helpers.php

+1
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,7 @@ function backpack_user()
179179
*/
180180
function mb_ucfirst($string, $encoding = false)
181181
{
182+
$string = $string ?? '';
182183
$encoding = $encoding ? $encoding : mb_internal_encoding();
183184

184185
$strlen = mb_strlen($string, $encoding);

src/resources/views/crud/columns/email.blade.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
$column['text'] = '-';
1212
1313
if(!empty($value)) {
14-
$column['text'] = $column['prefix'].Str::limit(strip_tags($value), $column['limit'], "[...]").$column['suffix'];
14+
$column['text'] = $column['prefix'].Str::limit(strip_tags($value ?? ''), $column['limit'], "[...]").$column['suffix'];
1515
}
1616
@endphp
1717

src/resources/views/crud/columns/model_function.blade.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
$column['prefix'] = $column['prefix'] ?? '';
88
$column['suffix'] = $column['suffix'] ?? '';
99
$column['text'] = $column['prefix'].
10-
Str::limit($value, $column['limit'], "[...]").
10+
Str::limit($value ?? '', $column['limit'], "[...]").
1111
$column['suffix'];
1212
@endphp
1313

src/resources/views/crud/columns/model_function_attribute.blade.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
$column['prefix'] = $column['prefix'] ?? '';
99
$column['suffix'] = $column['suffix'] ?? '';
1010
$column['text'] = $column['prefix'].
11-
Str::limit($value, $column['limit'], "[...]").
11+
Str::limit($value ?? '', $column['limit'], "[...]").
1212
$column['suffix'];
1313
@endphp
1414

src/resources/views/crud/columns/phone.blade.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
$column['text'] = '';
1111
1212
if(!empty($value)) {
13-
$column['text'] = $column['prefix'].Str::limit(strip_tags($value), $column['limit'], "[...]").$column['suffix'];
13+
$column['text'] = $column['prefix'].Str::limit(strip_tags($value ?? ''), $column['limit'], "[...]").$column['suffix'];
1414
}
1515
@endphp
1616

src/resources/views/crud/columns/row_number.blade.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
$column['prefix'] = $column['prefix'] ?? '';
66
$column['suffix'] = $column['suffix'] ?? '';
77
$column['text'] = $column['prefix'].
8-
Str::limit(strip_tags($rowNumber), $column['limit'], "[...]").
8+
Str::limit(strip_tags($rowNumber ?? ''), $column['limit'], "[...]").
99
$column['suffix'];
1010
@endphp
1111

src/resources/views/crud/columns/select.blade.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
99
$attributes = $crud->getRelatedEntriesAttributes($entry, $column['entity'], $column['attribute']);
1010
foreach ($attributes as $key => &$text) {
11-
$text = Str::limit($text, $column['limit'], '[...]');
11+
$text = Str::limit($text ?? '', $column['limit'], '[...]');
1212
}
1313
@endphp
1414

src/resources/views/crud/columns/select_multiple.blade.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
}
1717
1818
foreach ($results_array as $key => $text) {
19-
$results_array[$key] = Str::limit($text, $column['limit'], '[...]');
19+
$results_array[$key] = Str::limit($text ?? '', $column['limit'], '[...]');
2020
}
2121
@endphp
2222

src/resources/views/crud/columns/text.blade.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
$column['limit'] = $column['limit'] ?? 40;
88
$column['prefix'] = $column['prefix'] ?? '';
99
$column['suffix'] = $column['suffix'] ?? '';
10-
$column['text'] = $column['prefix'].Str::limit($value, $column['limit'], '[...]').$column['suffix'];
10+
$column['text'] = $column['prefix'].Str::limit($value ?? '', $column['limit'], '[...]').$column['suffix'];
1111
@endphp
1212

1313
<span>

0 commit comments

Comments
 (0)