Skip to content

Commit fb008b5

Browse files
authored
fix: avoid null array offset in rex_list::getSortColumn() under PHP 8.5 (#6586)
When the `list` request parameter matches the list name but no `sort` parameter is present, `$sortColumn` is null. Passing it to hasColumnOption() results in isset($this->columnOptions[null][...]).
1 parent a7b5baf commit fb008b5

2 files changed

Lines changed: 1 addition & 2 deletions

File tree

.tools/psalm/baseline.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4370,7 +4370,6 @@
43704370
<code><![CDATA[$columnLayout]]></code>
43714371
<code><![CDATA[$column['width'] ?? null]]></code>
43724372
<code><![CDATA[$sortColumn]]></code>
4373-
<code><![CDATA[$sortColumn]]></code>
43744373
<code><![CDATA[$this->getValue($column)]]></code>
43754374
<code><![CDATA[$this->getValue($columnName)]]></code>
43764375
</PossiblyNullArgument>

redaxo/src/core/lib/list.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -977,7 +977,7 @@ public function getSortColumn($default = null)
977977
{
978978
if (rex_request('list', 'string') == $this->getName()) {
979979
$sortColumn = rex_request('sort', 'string', $default);
980-
if ($this->hasColumnOption($sortColumn, REX_LIST_OPT_SORT)) {
980+
if (null !== $sortColumn && $this->hasColumnOption($sortColumn, REX_LIST_OPT_SORT)) {
981981
return $sortColumn;
982982
}
983983
}

0 commit comments

Comments
 (0)