From 286bc5908efc04e41d601d998d22fb68e517ac65 Mon Sep 17 00:00:00 2001
From: Dietmar Maurer <dietmar@proxmox.com>
Date: Mon, 11 Jun 2018 08:38:22 +0200
Subject: [PATCH] sync_userprefs_db: fix merge function

---
 PMG/Cluster.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/PMG/Cluster.pm b/PMG/Cluster.pm
index 8517984..5eb41b5 100644
--- a/PMG/Cluster.pm
+++ b/PMG/Cluster.pm
@@ -797,7 +797,7 @@ sub sync_userprefs_db {
 
     my $merge_sth = $dbh->prepare(
 	"INSERT INTO UserPrefs (PMail, Name, Data, MTime) " .
-	'VALUES (?, ?, ?, 0) ' .
+	'VALUES (?, ?, ?, ?) ' .
 	'ON CONFLICT (PMail, Name) DO UPDATE SET ' .
 	# Note: MTime = 0 ==> this is just a copy from somewhere else, not modified
 	'MTime = CASE WHEN excluded.MTime >= UserPrefs.MTime THEN 0 ELSE UserPrefs.MTime END, ' .
@@ -806,7 +806,7 @@ sub sync_userprefs_db {
     my $mergefunc = sub {
 	my ($ref) = @_;
 
-	$merge_sth->execute($ref->{pmail}, $ref->{name}, $ref->{data});
+	$merge_sth->execute($ref->{pmail}, $ref->{name}, $ref->{data}, $ref->{mtime});
     };
 
     return $sync_generic_mtime_db->($dbh, $rdb, $ni, 'UserPrefs', $selectfunc, $mergefunc);
-- 
2.39.2