diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-05-27 06:35:15 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-05-27 06:35:15 -0400 |
| commit | d554681174084e1715dfae4c21af9f6edcbad59e (patch) | |
| tree | eb585cce4ebe24d663b2e7eab28a62da612efec1 /include/dir_fns.php | |
| parent | e00b8a70829213a4333a53a097c2c498d529f5d6 (diff) | |
| parent | 551cf8ee9413c5c57e7b71d6016466e598636900 (diff) | |
| download | volse-hubzilla-d554681174084e1715dfae4c21af9f6edcbad59e.tar.gz volse-hubzilla-d554681174084e1715dfae4c21af9f6edcbad59e.tar.bz2 volse-hubzilla-d554681174084e1715dfae4c21af9f6edcbad59e.zip | |
Merge remote-tracking branch 'upstream/dev' into wiki
Diffstat (limited to 'include/dir_fns.php')
| -rw-r--r-- | include/dir_fns.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/dir_fns.php b/include/dir_fns.php index 1c3149081..9f1be1a42 100644 --- a/include/dir_fns.php +++ b/include/dir_fns.php @@ -69,9 +69,8 @@ function check_upstream_directory() { if ($directory) { $h = parse_url($directory); if ($h) { - $x = zot_finger('[system]@' . $h['host']); - if ($x['success']) { - $j = json_decode($x['body'], true); + $j = Zotlabs\Zot\Finger::run('[system]@' . $h['host']); + if ($j['success']) { if (array_key_exists('site', $j) && array_key_exists('directory_mode', $j['site'])) { if ($j['site']['directory_mode'] === 'normal') { $isadir = false; @@ -95,6 +94,9 @@ function get_directory_setting($observer, $setting) { if($ret === false) $ret = get_config('directory', $setting); + + // 'safemode' is the default if there is no observer or no established preference. + if($setting == 'safemode' && $ret === false) $ret = 1; |