From 10ea7592827e0292797b2e7dd2e0676b6665ac5f Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 29 Apr 2017 08:30:43 +0000 Subject: [PATCH] Don't update the conversation only because the source changed --- include/items.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/items.php b/include/items.php index 4d2a8ae52d..5eac12d891 100644 --- a/include/items.php +++ b/include/items.php @@ -446,6 +446,12 @@ function store_conversation($arr) { $old_conv = dba::fetch_first("SELECT `item-uri`, `reply-to-uri`, `conversation-uri`, `conversation-href`, `protocol`, `source` FROM `conversation` WHERE `item-uri` = ?", $conversation['item-uri']); if (dbm::is_result($old_conv)) { + // Don't update when only the source has changed. + // Only do this when there had been no source before. + if ($old_conv['source'] != '') { + unset($old_conv['source']); + } + // Update structure data all the time but the source only when its from a better protocol. if (($old_conv['protocol'] < $conversation['protocol']) AND ($old_conv['protocol'] != 0)) { unset($conversation['protocol']); unset($conversation['source']); -- 2.39.5