reduce duplication - only provide one system language setting

1 files changed, 5 insertions, 4 deletions

diff --git a/include/items.php b/include/items.php
index 4c84b32f8..9c72d5359 100755
--- a/include/items.php
+++ b/include/items.php
@@ -2094,7 +2094,7 @@ function local_delivery($importer,$data) {
 		}
 	}
 
-	if((is_array($contact)) && ($photo_timestamp) && (strlen($photo_url)) && ($photo_timestamp > $importer['avatar-date'])) {
+	if(($photo_timestamp) && (strlen($photo_url)) && ($photo_timestamp > $importer['avatar-date'])) {
 		logger('local_delivery: Updating photo for ' . $importer['name']);
 		require_once("Photo.php");
 		$photo_failure = false;
@@ -2152,7 +2152,7 @@ function local_delivery($importer,$data) {
 		}
 	}
 
-	if((is_array($contact)) && ($name_updated) && (strlen($new_name)) && ($name_updated > $contact['name-date'])) {
+	if(($name_updated) && (strlen($new_name)) && ($name_updated > $importer['name-date'])) {
 		$r = q("select * from contact where uid = %d and id = %d limit 1",
 			intval($importer['importer_uid']),
 			intval($importer['id'])
@@ -2971,7 +2971,8 @@ function local_delivery($importer,$data) {
 			$datarray['uid'] = $importer['importer_uid'];
 			$datarray['contact-id'] = $importer['id'];
 
-			if(! link_compare($datarray['owner-link'],$contact['url'])) {
+
+			if(! link_compare($datarray['owner-link'],$importer['url'])) {
 				// The item owner info is not our contact. It's OK and is to be expected if this is a tgroup delivery, 
 				// but otherwise there's a possible data mixup on the sender's system.
 				// the tgroup delivery code called from item_store will correct it if it's a forum,
@@ -3246,7 +3247,7 @@ function atom_entry($item,$type,$author,$owner,$comment = false,$cid = 0) {
 	if(strlen($item['owner-name']))
 		$o .= atom_author('dfrn:owner',$item['owner-name'],$item['owner-link'],80,80,$item['owner-avatar']);
 
-	if(($item['parent'] != $item['id']) || ($item['parent-uri'] !== $item['uri']) || ($item['thr-parent'])) {
+	if(($item['parent'] != $item['id']) || ($item['parent-uri'] !== $item['uri']) || (($item['thr-parent'] !== '') && ($item['thr-parent'] !== $item['uri']))) {
 		$parent_item = (($item['thr-parent']) ? $item['thr-parent'] : $item['parent-uri']);
 		$o .= '<thr:in-reply-to ref="' . xmlify($parent_item) . '" type="text/html" href="' .  xmlify($a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['parent']) . '" />' . "\r\n";
 	}