Merge branch 'dev' into perms

2016-07-12 20:50:27 -07:00
parent a01baab4f0 bdd7d24ac1
commit 6424bac47c
16 changed files with 26 additions and 48 deletions
--- a/include/zot.php
+++ b/include/zot.php
@@ -2952,7 +2952,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)