Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions modules/backend/widgets/Filter.php
Original file line number Diff line number Diff line change
Expand Up @@ -687,8 +687,8 @@ public function removeScope($scopeName)
*/
protected function makeFilterScope($name, $config)
{
$label = $config['label'] ?? null;
$scopeType = $config['type'] ?? null;
$label = $config['label'] ?? '';
$scopeType = $config['type'] ?? '';

$scope = new FilterScope($name, $label);
$scope->displayAs($scopeType, $config);
Expand Down
2 changes: 1 addition & 1 deletion modules/backend/widgets/Lists.php
Original file line number Diff line number Diff line change
Expand Up @@ -926,7 +926,7 @@ protected function makeListColumn($name, $config)
$config['searchable'] = false;
}

$columnType = $config['type'] ?? null;
$columnType = $config['type'] ?? '';

$column = new ListColumn($name, $label);
$column->displayAs($columnType, $config);
Expand Down
2 changes: 1 addition & 1 deletion modules/system/classes/SettingsManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ public function getContext()
{
return (object) [
'itemCode' => $this->contextItemCode,
'owner' => strtolower($this->aliases[$this->contextOwner] ?? $this->contextOwner),
'owner' => strtolower($this->aliases[$this->contextOwner] ?? ($this->contextOwner ?? '')),
];
}

Expand Down
2 changes: 1 addition & 1 deletion modules/system/helpers/DateTime.php
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,6 @@ public static function momentFormat($format)
$replacements['\\'.$from] = '['.$from.']';
}

return strtr($format, $replacements);
return strtr($format ?? '', $replacements);
}
}
4 changes: 2 additions & 2 deletions modules/system/partials/_settings_menu_items.htm
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
$context = System\Classes\SettingsManager::instance()->getContext();

$collapsedGroups = explode('|',
isset($_COOKIE['sidenav_treegroupStatus']) ? $_COOKIE['sidenav_treegroupStatus'] : null
isset($_COOKIE['sidenav_treegroupStatus']) ? $_COOKIE['sidenav_treegroupStatus'] : ''
);

?>
Expand All @@ -28,4 +28,4 @@ <h3><?= e(trans($category)) ?></h3>
</ul>
</li>
<?php endforeach ?>
</ul>
</ul>