Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

PHP8 Compatibility #1412

Merged
merged 1 commit into from
Apr 6, 2023
Merged

PHP8 Compatibility #1412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion app/lib/BaseFindController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,11 @@ public function Index($pa_options=null) {
$vs_label_display_field = $t_label->getDisplayField();
foreach($display_list as $i => $va_display_item) {
$tmp = explode('.', $va_display_item['bundle_name']);


if(!isset($tmp[1])){
$tmp[1] = null;
}

if (
(($tmp[0] === $vs_label_table_name) && ($tmp[1] === $vs_label_display_field))
||
Expand Down
2 changes: 1 addition & 1 deletion app/lib/Plugins/TaskQueueHandlers/batchEditor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public function getParametersForDisplay($rec) {

$params = [];

$t_set = new ca_sets($parameters['set_id']);
$t_set = new ca_sets($parameters['set_id'] ?? null);
$params['importing_from'] = array(
'label' => _t("Applying batch edits to set"),
'value' => $t_set->getLabelForDisplay()
Expand Down
6 changes: 5 additions & 1 deletion app/models/ca_bundle_displays.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2918,7 +2918,11 @@ public function getDisplayListForResultsEditor(string $table, $options=null) {
$label_display_field = $t_label ? $t_label->getDisplayField() : null;
foreach($display_list as $i => $display_item) {
$tmp = explode('.', $display_item['bundle_name']);


if(!isset($tmp[1])){
$tmp[1] = null;
}

if (
(($tmp[0] === $label_table_name) && ($tmp[1] === $label_display_field))
||
Expand Down