diff options
| author | zottel <github@zottel.net> | 2014-02-21 08:54:46 +0100 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2014-02-21 08:54:46 +0100 |
| commit | 8bd006bea83b3dbc02d94b4714a658e8742d9633 (patch) | |
| tree | 078e9d4b634d583de8359ddae94c69d86ec19d17 /include/zot.php | |
| parent | 79c566bda33645f42f8545fdc6e55af35c4a7d5c (diff) | |
| parent | 44d7047fce57085fe63ad5e1088911e9fc07a32e (diff) | |
| download | volse-hubzilla-8bd006bea83b3dbc02d94b4714a658e8742d9633.tar.gz volse-hubzilla-8bd006bea83b3dbc02d94b4714a658e8742d9633.tar.bz2 volse-hubzilla-8bd006bea83b3dbc02d94b4714a658e8742d9633.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/zot.php')
| -rw-r--r-- | include/zot.php | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/zot.php b/include/zot.php index a7094b2ad..298abb178 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1279,11 +1279,6 @@ function allowed_public_recips($msg) { if(array_key_exists('public_scope',$msg['message'])) $scope = $msg['message']['public_scope']; - // we can pull out these two lines once everybody has upgraded to >= 2013-02-15.225 - - else - $scope = 'public'; - $hash = base64url_encode(hash('whirlpool',$msg['notify']['sender']['guid'] . $msg['notify']['sender']['guid_sig'], true)); if($scope === 'public' || $scope === 'network: red') |