fix profile update propagation

2 files changed, 13 insertions, 9 deletions

diff --git a/include/directory.php b/include/directory.php
index 5f3696a58..c286f5683 100644
--- a/include/directory.php
+++ b/include/directory.php
@@ -19,11 +19,6 @@ function directory_run($argv, $argc){
 	if($dirmode === false)
 		$dirmode = DIRECTORY_MODE_NORMAL;
 
-	if(($dirmode == DIRECTORY_MODE_PRIMARY) || ($dirmode == DIRECTORY_MODE_STANDALONE)) {
-		syncdirs($argv[1]);
-		return;
-	}
-
 	$x = q("select * from channel where channel_id = %d limit 1",
 		intval($argv[1])
 	);
@@ -32,6 +27,15 @@ function directory_run($argv, $argc){
 
 	$channel = $x[0];
 
+
+	if(($dirmode == DIRECTORY_MODE_PRIMARY) || ($dirmode == DIRECTORY_MODE_STANDALONE)) {
+		syncdirs($argv[1]);
+
+		// Now update all the connections
+		proc_run('php','include/notifier.php','refresh_all',$channel['channel_id']);
+		return;
+	}
+
 	$directory = find_upstream_directory($dirmode);
 
 	if($directory) {
@@ -49,7 +53,7 @@ function directory_run($argv, $argc){
 
 	// Now update all the connections
 
-	proc_run('php','notifier','refresh_all',$channel['channel_id']);
+	proc_run('php','include/notifier.php','refresh_all',$channel['channel_id']);
 
 }
 
diff --git a/include/notifier.php b/include/notifier.php
index 7d107e4d4..96c0bf31f 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -189,6 +189,7 @@ function notifier_run($argv, $argc){
 		$item = $suggest[0];
 	}
 	elseif($cmd === 'refresh_all') {
+		logger('notifier: refresh_all: ' . $item_id);
 		$s = q("select * from channel where channel_id = %d limit 1",
 			intval($item_id)
 		);
@@ -196,10 +197,9 @@ function notifier_run($argv, $argc){
 			$channel = $s[0];
 		$uid = $item_id;
 		$recipients = array();
-		$r = q("select * from abook where abook_channel = %d and not (abook_flags & %d) and not (abook_flags & %d)",
+		$r = q("select * from abook where abook_channel = %d and not (abook_flags & %d)",
 			intval($item_id),
-			intval(ABOOK_FLAG_SELF),
-			intval(ABOOK_FLAG_PENDING)
+			intval(ABOOK_FLAG_SELF)
 		);
 		if($r) {
 			foreach($r as $rr) {