diff options
| author | Max Kostikov <max@kostikov.co> | 2018-12-20 20:51:26 +0100 |
|---|---|---|
| committer | Max Kostikov <max@kostikov.co> | 2018-12-20 20:51:26 +0100 |
| commit | 89e734dcca1525fa804343d6ecf5286ce70b05ba (patch) | |
| tree | 10d0a3614e9f97f5065ea53fff1c3d5fcd292c16 /include/zot.php | |
| parent | 3a662555768840d18c6dbba027af644eda54f20e (diff) | |
| parent | 090fe394e4733aea9e9ca2e9a93c2c27b266d065 (diff) | |
| download | volse-hubzilla-89e734dcca1525fa804343d6ecf5286ce70b05ba.tar.gz volse-hubzilla-89e734dcca1525fa804343d6ecf5286ce70b05ba.tar.bz2 volse-hubzilla-89e734dcca1525fa804343d6ecf5286ce70b05ba.zip | |
Merge branch 'dev' into 'dev'
Sync dev
See merge request kostikov/core!1
Diffstat (limited to 'include/zot.php')
| -rw-r--r-- | include/zot.php | 2 |
1 files changed, 2 insertions, 0 deletions
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']); |