Merge branch '8.4RC'8.4

1 files changed, 7 insertions, 9 deletions

diff --git a/boot.php b/boot.php
index 3da55d6f5..151310624 100644
--- a/boot.php
+++ b/boot.php
@@ -60,10 +60,10 @@ require_once('include/bbcode.php');
 require_once('include/items.php');
 
 define('PLATFORM_NAME', 'hubzilla');
-define('STD_VERSION', '8.2');
+define('STD_VERSION', '8.4');
 define('ZOT_REVISION', '6.0');
 
-define('DB_UPDATE_VERSION', 1255);
+define('DB_UPDATE_VERSION', 1258);
 
 define('PROJECT_BASE', __DIR__);
 
@@ -84,6 +84,10 @@ define('DIRECTORY_MODE_PRIMARY', 0x0001); // There can only be *one* primary dir
 define('DIRECTORY_MODE_SECONDARY', 0x0002); // All other mirror directory servers
 define('DIRECTORY_MODE_STANDALONE', 0x0100); // A detached (off the grid) hub with itself as directory server.
 
+define('DIRECTORY_FLAG_OK',     0);
+define('DIRECTORY_FLAG_UNSAFE', 1);
+define('DIRECTORY_FLAG_HIDDEN', 2);
+
 // We will look for upstream directories whenever me make contact
 // with other sites, but if this is a new installation and isn't
 // a standalone hub, we need to seed the service with a starting
@@ -96,8 +100,7 @@ define('DIRECTORY_FALLBACK_MASTER', 'https://hub.netzgemeinde.eu');
 function get_directory_fallback_servers() {
 	$ret = [
 		'https://hub.netzgemeinde.eu',
-		'https://zotsite.net',
-		'https://hub.libranet.de'
+		'https://zotsite.net'
 	];
 
 	return $ret;
@@ -364,11 +367,6 @@ define('POLL_TENSCALE', 0x0002);  // 1-10
 define('POLL_MULTIPLE_CHOICE', 0x0004);
 define('POLL_OVERWRITE', 0x8000);  // If you vote twice remove the prior entry
 
-
-define('UPDATE_FLAGS_UPDATED', 0x0001);
-define('UPDATE_FLAGS_FORCED', 0x0002);
-define('UPDATE_FLAGS_DELETED', 0x1000);
-
 define('HUBLOC_OFFLINE', 0x0001);
 
 define('DROPITEM_NORMAL', 0);