Skip to content

Fix history logging: avoid non-numeric values in old_id/new_id #22908

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

Open
vincent1890 wants to merge 5 commits into
base: 11.0/bugfixes
Choose a base branch
from
Open

Fix history logging: avoid non-numeric values in old_id/new_id #22908

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2429a84
Fix history logging: avoid non-numeric values in old_id/new_id
vincent1890 Jan 29, 2026
cd908c3
add comments code
vincent1890 Jan 29, 2026
5493ab0
Update fix Log.php
vincent1890 Feb 1, 2026
b7821a8
Merge branch 'glpi-project:11.0/bugfixes' into fix-history-oldid-text
vincent1890 Feb 3, 2026
c4859a3
Format type casting for clarity
vincent1890 Feb 3, 2026
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
55 changes: 37 additions & 18 deletions src/Log.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,31 +179,50 @@ public static function constructHistory(CommonDBTM $item, $oldvalues, $values)
// Linkfield or standard field not massive action enable
$id_search_option = $key2; // Give ID of the $SEARCHOPTION

// Only consider link/dropdown handling when the search option
// effectively targets the parent item table or the current item table.
$parent_table = getTableForItemType($real_type);
if (($val2['table'] !== $parent_table) && ($val2['table'] !== $item->getTable())) {
// If the option is actually a plain text/string field, keep it as text
if (isset($val2['datatype']) && in_array($val2['datatype'], ['text', 'string'], true)) {
$changes = [$id_search_option, $oldval ?? '', $values[$key] ?? ''];
}
continue;
}

if ($val2['table'] == $item->getTable()) {
$changes = [$id_search_option, $oldval ?? '', $values[$key] ?? ''];
} else {
// other cases; link field -> get data from dropdown
$changes = [$id_search_option,
sprintf(
__('%1$s (%2$s)'),
Dropdown::getDropdownName(
$val2["table"],
if (isset($val2['datatype']) && in_array($val2['datatype'], ['text', 'string'], true)) {
$changes = [$id_search_option, $oldval ?? '', $values[$key] ?? ''];
break;
}

if (!is_numeric($oldval) || !is_numeric($values[$key] ?? null)) {
$changes = [$id_search_option, $oldval ?? '', $values[$key] ?? ''];
} else {
Copy link
Contributor

@trasher trasher Feb 4, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems like this is never closed; that's probably the cause of the syntax error.

Please test your proposal on a local instance; this PR cannot work as is.

// Both numeric — safe to use dropdown/id representation
$changes = [$id_search_option,
sprintf(
__('%1$s (%2$s)'),
Dropdown::getDropdownName(
$val2["table"],
$oldval
),
$oldval
),
$oldval
),
sprintf(
__('%1$s (%2$s)'),
Dropdown::getDropdownName(
$val2["table"],
sprintf(
__('%1$s (%2$s)'),
Dropdown::getDropdownName(
$val2["table"],
$values[$key]
),
$values[$key]
),
$values[$key]
),
$oldval,
(int) $values[$key],
];
}
$oldval,
(int)$values[$key],
];
}
break;
}
}
Expand Down
Loading