Merge remote-tracking branch 'upstream/master'

3 files changed, 9 insertions, 5 deletions

diff --git a/include/dir_fns.php b/include/dir_fns.php
new file mode 100644
index 000000000..683ed9e5b
--- /dev/null
+++ b/include/dir_fns.php
@@ -0,0 +1,6 @@
+<?php
+
+function find_upstream_directory($dirmode) {
+	return '';
+}
+
diff --git a/include/directory.php b/include/directory.php
index 5b5698768..105686ca7 100644
--- a/include/directory.php
+++ b/include/directory.php
@@ -1,11 +1,9 @@
-<?php
+g<?php
 require_once('boot.php');
 require_once('include/zot.php');
 require_once('include/cli_startup.php');
+require_once('include/dir_fns.php');
 
-function find_upstream_directory($dirmode) {
-	return;
-}
 
 function directory_run($argv, $argc){
 
diff --git a/include/zot.php b/include/zot.php
index 31f0e8771..049cf004b 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -284,7 +284,7 @@ function zot_refresh($them,$channel = null) {
 					intval($default_perms),
 					dbesc(datetime_convert()),
 					dbesc(datetime_convert()),
-					intval(($default_perms) ? 0 : ABOOK_FLAG_BLOCKED|ABOOK_FLAG_IGNORED|ABOOK_FLAG_PENDING)
+					intval(($default_perms) ? 0 : ABOOK_FLAG_PENDING)
 				);
 				if($y) {
 					logger("New introduction received for {$channel['channel_name']}");