diff options
author | Mario <mario@mariovavti.com> | 2021-01-11 19:01:02 +0000 |
---|---|---|
committer | Mario <mario@mariovavti.com> | 2021-01-11 19:01:02 +0000 |
commit | ba164d948822f00a643c4f12ba82f18e7e0f72be (patch) | |
tree | cd160488d8827c27d69794c4067734c018e46428 /include | |
parent | 3fe67eb646befb47b3d421e12e55020f035e26b3 (diff) | |
parent | 12ba2c30b907c5350a4a79e04391f5c0e356b547 (diff) | |
download | volse-hubzilla-ba164d948822f00a643c4f12ba82f18e7e0f72be.tar.gz volse-hubzilla-ba164d948822f00a643c4f12ba82f18e7e0f72be.tar.bz2 volse-hubzilla-ba164d948822f00a643c4f12ba82f18e7e0f72be.zip |
Merge branch 'dev' into 5.2RC
Diffstat (limited to 'include')
-rw-r--r-- | include/dir_fns.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/dir_fns.php b/include/dir_fns.php index b0609ce8b..88a1bb74f 100644 --- a/include/dir_fns.php +++ b/include/dir_fns.php @@ -16,7 +16,6 @@ require_once('include/permissions.php'); * @return array */ function find_upstream_directory($dirmode) { - global $DIRECTORY_FALLBACK_SERVERS; $preferred = get_config('system','directory_server'); @@ -43,10 +42,12 @@ function find_upstream_directory($dirmode) { * directory server if you don't like our choice or if circumstances change. */ + $directory_fallback_servers = get_directory_fallback_servers(); + $dirmode = intval(get_config('system','directory_mode')); if ($dirmode == DIRECTORY_MODE_NORMAL) { - $toss = mt_rand(0,count($DIRECTORY_FALLBACK_SERVERS)); - $preferred = $DIRECTORY_FALLBACK_SERVERS[$toss]; + $toss = mt_rand(0,count($directory_fallback_servers)); + $preferred = $directory_fallback_servers[$toss]; set_config('system','directory_server',$preferred); } else{ set_config('system','directory_server',z_root()); |