From 39cc0fe4cb909a52b3bb75b685ca7142863a6027 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Sun, 19 Oct 2014 00:05:06 +0200
Subject: [PATCH] Bugfix: Sometimes it happened that the own contact data was
 deleted. This was caused by the statusnet connector.

---
 statusnet/statusnet.php | 9 ++++-----
 twitter/twitter.php     | 3 +++
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index c3591356..e96a8967 100644
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -872,6 +872,9 @@ function statusnet_address($contact) {
 }
 
 function statusnet_fetch_contact($uid, $contact, $create_user) {
+	if ($contact->statusnet_profile_url == "")
+		return(-1);
+
 	// Check if the unique contact is existing
 	// To-Do: only update once a while
 	 $r = q("SELECT id FROM unique_contacts WHERE url='%s' LIMIT 1",
@@ -950,16 +953,12 @@ function statusnet_fetch_contact($uid, $contact, $create_user) {
 		q("UPDATE `contact` SET `photo` = '%s',
 					`thumb` = '%s',
 					`micro` = '%s',
-					`name-date` = '%s',
-					`uri-date` = '%s',
 					`avatar-date` = '%s'
 				WHERE `id` = %d",
 			dbesc($photos[0]),
 			dbesc($photos[1]),
 			dbesc($photos[2]),
 			dbesc(datetime_convert()),
-			dbesc(datetime_convert()),
-			dbesc(datetime_convert()),
 			intval($contact_id)
 		);
 
@@ -971,7 +970,7 @@ function statusnet_fetch_contact($uid, $contact, $create_user) {
 
 		// check that we have all the photos, this has been known to fail on occasion
 
-		if((! $r[0]['photo']) || (! $r[0]['thumb']) || (! $r[0]['micro']) || ($update_photo)) {
+		if((!$r[0]['photo']) || (!$r[0]['thumb']) || (!$r[0]['micro']) || ($update_photo)) {
 
 			logger("statusnet_fetch_contact: Updating contact ".$contact->screen_name, LOGGER_DEBUG);
 
diff --git a/twitter/twitter.php b/twitter/twitter.php
index 1919e28c..2669c46d 100644
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -892,6 +892,9 @@ function twitter_queue_hook(&$a,&$b) {
 function twitter_fetch_contact($uid, $contact, $create_user) {
 	require_once("include/Photo.php");
 
+	if ($contact->id_str == "")
+		return(-1);
+
 	$avatar = str_replace("_normal.", ".", $contact->profile_image_url_https);
 
 	$info = get_photo_info($avatar);