Merge remote-tracking branch 'upstream/dev' into website-import

2 files changed, 11 insertions, 19 deletions

diff --git a/include/items.php b/include/items.php
index 72f0896ad..373090d41 100755
--- a/include/items.php
+++ b/include/items.php
@@ -4154,32 +4154,19 @@ function update_remote_id($channel,$post_id,$webpage,$pagetitle,$namespace,$remo
 	}
 
 	if($page_type) {
-
 		// store page info as an alternate message_id so we can access it via
 		//    https://sitename/page/$channelname/$pagetitle
 		// if no pagetitle was given or it couldn't be transliterated into a url, use the first
 		// sixteen bytes of the mid - which makes the link portable and not quite as daunting
 		// as the entire mid. If it were the post_id the link would be less portable.
 
-		$r = q("select * from item_id where iid = %d and uid = %d and service = '%s' limit 1",
+		\Zotlabs\Lib\IConfig::Set(
 			intval($post_id),
-			intval($channel['channel_id']),
-			dbesc($page_type)
+			'system',
+			$page_type,
+			($pagetitle) ? $pagetitle : substr($mid,0,16),
+			false
 		);
-		if($r) {
-			q("update item_id set sid = '%s' where id = %d",
-				dbesc(($pagetitle) ? $pagetitle : substr($mid,0,16)),
-				intval($r[0]['id'])
-			);
-		}
-		else {
-			q("insert into item_id ( iid, uid, sid, service ) values ( %d, %d, '%s','%s' )",
-				intval($post_id),
-				intval($channel['channel_id']),
-				dbesc(($pagetitle) ? $pagetitle : substr($mid,0,16)),
-				dbesc($page_type)
-			);
-		}
 	}
 }
 
diff --git a/include/zot.php b/include/zot.php
index 6dd789181..45347ef22 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -3014,7 +3014,12 @@ function build_sync_packet($uid = 0, $packet = null, $groups_changed = false) {
 		if($x['hubloc_host'] == App::get_hostname())
 			continue;
 
-		$synchubs[] = $x;
+		$y = q("select site_dead from site where site_url = '%s' limit 1",
+			dbesc($x['hubloc_url'])
+		);
+
+		if((! $y) || ($y[0]['site_dead'] == 0))
+			$synchubs[] = $x;
 	}
 
 	if(! $synchubs)