diff options
| author | Michael Vogel <icarus@dabo.de> | 2012-06-23 12:50:00 +0200 |
|---|---|---|
| committer | Michael Vogel <icarus@dabo.de> | 2012-06-23 12:50:00 +0200 |
| commit | a81af2e042ae133bec3097488feeaa1318dc798b (patch) | |
| tree | 25d2103fb3ce9edf45c0f7d1142b5cd3f63f8591 /mod/dfrn_poll.php | |
| parent | 7a4ad4564dc4fa49aa860a10949ffe8958305f3a (diff) | |
| parent | bf47bf5ba015a844919362a56903eb82c064bee9 (diff) | |
| download | volse-hubzilla-a81af2e042ae133bec3097488feeaa1318dc798b.tar.gz volse-hubzilla-a81af2e042ae133bec3097488feeaa1318dc798b.tar.bz2 volse-hubzilla-a81af2e042ae133bec3097488feeaa1318dc798b.zip | |
Merge remote branch 'upstream/master'
Conflicts:
include/bb2diaspora.php
Diffstat (limited to 'mod/dfrn_poll.php')
| -rw-r--r-- | mod/dfrn_poll.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php index 436727a78..f3c145410 100644 --- a/mod/dfrn_poll.php +++ b/mod/dfrn_poll.php @@ -443,7 +443,7 @@ function dfrn_poll_content(&$a) { $encrypted_id = ''; $id_str = $my_id . '.' . mt_rand(1000,9999); - if($r[0]['duplex'] && strlen($r[0]['pubkey'])) { + if(($r[0]['duplex'] && strlen($r[0]['pubkey'])) || (! strlen($r[0]['prvkey']))) { openssl_public_encrypt($hash,$challenge,$r[0]['pubkey']); openssl_public_encrypt($id_str,$encrypted_id,$r[0]['pubkey']); } |