thwart attempts to use an external private directory as a directory server

This commit is contained in:
redmatrix 2015-11-09 14:53:58 -08:00
parent 271a41b7dd
commit 862a310075

View File

@ -15,6 +15,19 @@ function find_upstream_directory($dirmode) {
global $DIRECTORY_FALLBACK_SERVERS;
$preferred = get_config('system','directory_server');
// Thwart attempts to use a private directory
if(($preferred) && ($prefered != z_root())) {
$r = q("select * from site where site_url = '%s' limit 1",
dbesc($preferred)
);
if(($r) && ($r[0]['site_flags'] & DIRECTORY_MODE_STADALONE)) {
$preferred = '';
}
}
if (! $preferred) {
/*