diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-12-18 09:59:34 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-12-18 09:59:34 +0100 |
| commit | 63b205c601c8ff567407155c327515bb0c5165b3 (patch) | |
| tree | edd456a39ad0daf12d6cc4409a99477f4fb38d82 /include | |
| parent | d190b1995b0886b430beb5dac1a1e72582b9ad2b (diff) | |
| parent | 8d70b919551f6f6462e639f7cfffda9825344e43 (diff) | |
| download | volse-hubzilla-63b205c601c8ff567407155c327515bb0c5165b3.tar.gz volse-hubzilla-63b205c601c8ff567407155c327515bb0c5165b3.tar.bz2 volse-hubzilla-63b205c601c8ff567407155c327515bb0c5165b3.zip | |
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'include')
| -rw-r--r-- | include/follow.php | 4 | ||||
| -rw-r--r-- | include/zot.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/follow.php b/include/follow.php index 964c43ff2..038e6e9c0 100644 --- a/include/follow.php +++ b/include/follow.php @@ -266,9 +266,7 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false) } } else { - $closeness = get_pconfig($uid,'system','new_abook_closeness'); - if($closeness === false) - $closeness = 80; + $closeness = get_pconfig($uid,'system','new_abook_closeness',80); $r = abook_store_lowlevel( [ diff --git a/include/zot.php b/include/zot.php index d031b4a96..9934dae07 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1232,6 +1232,7 @@ function zot_fetch($arr) { $datatosend = json_encode(crypto_encapsulate(json_encode($data),$hub['hubloc_sitekey'], $algorithm)); $import = zot_zot($url,$datatosend); + } else { $algorithm = zot_best_algorithm($hub['site_crypto']); @@ -4913,6 +4914,7 @@ function zot_reply_pickup($data) { dbesc($data['secret']), dbesc($data['callback']) ); + if(! $r) { $ret['message'] = 'nothing to pick up'; logger('mod_zot: pickup: ' . $ret['message']); |