morgane/EverShelf
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Actualiser api/index.php
CI / PHP Syntax Check (push) Has been cancelled
Details
CI / JavaScript Lint (push) Has been cancelled
Details
CI / Docker Build Test (push) Has been cancelled
Details
CI / Validate Translation Files (push) Has been cancelled
Details
Security Scan (Trivy) / Trivy — Docker image scan (push) Has been cancelled
Details
Security Scan (Trivy) / Trivy — Filesystem scan (push) Has been cancelled
Details
CI / Auto-merge develop → main (push) Has been cancelled
Details
CI / Create GitHub Release (push) Has been cancelled
Details

Browse Source
This commit is contained in:
morgane
2026-06-27 17:49:17 +00:00
parent 616818998d
commit ca98acc1f2
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/index.php
+9 -5
View File
@@ -9008,13 +9008,17 @@ function importMergeBackup(PDO $db): void {
$exists->execute($params);
$existingId = $exists->fetchColumn();
if ($existingId) {
// Update label/icon (and keywords if present) from prod, keep local id/is_builtin
$updCols = array_diff(array_keys($row), $uniqueCols, ['is_builtin', 'sort_order']);
$skipCols = array_merge($uniqueCols, ['is_builtin', 'sort_order']);
$updCols = [];
$updParams = [];
foreach ($row as $col => $val) {
if (in_array($col, $skipCols, true)) continue;
$updCols[] = "$col = ?";
$updParams[] = $val;
}
if (!empty($updCols)) {
$setClause = implode(', ', array_map(fn($c) => "$c = ?", $updCols));
$updParams = array_map(fn($c) => $row[$c], $updCols);
$updParams[] = $existingId;
$db->prepare("UPDATE {$table} SET {$setClause} WHERE id = ?")->execute($updParams);
$db->prepare("UPDATE {$table} SET " . implode(', ', $updCols) . " WHERE id = ?")->execute($updParams);
}
continue;
}