Don't update the conversation only because the source changed

diff --git a/include/items.php b/include/items.php
index 4d2a8ae52d37f6b6ab6f4497ae78c56a7a75030f..5eac12d8914df6300969614a304dda8d214e04e5 100644 (file)
--- 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']);