Only update contact data for OStatus contacts

[friendica.git] / include / ostatus.php

diff --git a/include/ostatus.php b/include/ostatus.php
index 736125de553e9991fc6e273ce3f2a4fd408ffaa4..523ccfe510e55144255fb0052dd693db7425c976 100644 (file)
--- a/include/ostatus.php
+++ b/include/ostatus.php
@@ -137,9 +137,9 @@ function ostatus_fetchauthor($xpath, $context, $importer, &$contact, $onlyfetch)
                        if ($value != "")
                                $contact["location"] = $value;
 
-                       q("UPDATE `contact` SET `name` = '%s', `nick` = '%s', `about` = '%s', `location` = '%s', `name-date` = '%s' WHERE `id` = %d",
+                       q("UPDATE `contact` SET `name` = '%s', `nick` = '%s', `about` = '%s', `location` = '%s', `name-date` = '%s' WHERE `id` = %d AND `network` = '%s'",
                                dbesc($contact["name"]), dbesc($contact["nick"]), dbesc($contact["about"]), dbesc($contact["location"]),
-                               dbesc(datetime_convert()), intval($contact["id"]));
+                               dbesc(datetime_convert()), intval($contact["id"]), dbesc(NETWORK_OSTATUS));
 
                        poco_check($contact["url"], $contact["name"], $contact["network"], $author["author-avatar"], $contact["about"], $contact["location"],
                                        "", "", "", datetime_convert(), 2, $contact["id"], $contact["uid"]);
@@ -152,9 +152,9 @@ function ostatus_fetchauthor($xpath, $context, $importer, &$contact, $onlyfetch)
 
                        $photos = import_profile_photo($author["author-avatar"], $importer["uid"], $contact["id"]);
 
-                       q("UPDATE `contact` SET `photo` = '%s', `thumb` = '%s', `micro` = '%s', `avatar-date` = '%s' WHERE `id` = %d",
+                       q("UPDATE `contact` SET `photo` = '%s', `thumb` = '%s', `micro` = '%s', `avatar-date` = '%s' WHERE `id` = %d AND `network` = '%s'",
                                dbesc($photos[0]), dbesc($photos[1]), dbesc($photos[2]),
-                               dbesc(datetime_convert()), intval($contact["id"]));
+                               dbesc(datetime_convert()), intval($contact["id"]), dbesc(NETWORK_OSTATUS));
                }
        }
 
@@ -705,8 +705,8 @@ function ostatus_completion($conversation_url, $uid, $item = array()) {
                $no_of_items = sizeof($items);
 
                if (@is_array($conv_as->items))
-                       foreach ($conv_as->items AS $item)
-                               $items[$item->id] = $item;
+                       foreach ($conv_as->items AS $single_item)
+                               $items[$single_item->id] = $single_item;
 
                if ($no_of_items == sizeof($items))
                        break;