diff options
| author | root <root@diekershoff.homeunix.net> | 2011-01-15 08:54:41 +0100 |
|---|---|---|
| committer | root <root@diekershoff.homeunix.net> | 2011-01-15 08:54:41 +0100 |
| commit | 3323f256c35ceb30a4b2ac1984a2eded672eb33f (patch) | |
| tree | 7b074e621e57be7d8f33eec8a281d5dd0bc3ab65 /mod/salmon.php | |
| parent | 30551b24ec833ef58e98071e56cb3bb94f302dd3 (diff) | |
| parent | e7ae4ad3fa010e5f636738366aae81e129990fa7 (diff) | |
| download | volse-hubzilla-3323f256c35ceb30a4b2ac1984a2eded672eb33f.tar.gz volse-hubzilla-3323f256c35ceb30a4b2ac1984a2eded672eb33f.tar.bz2 volse-hubzilla-3323f256c35ceb30a4b2ac1984a2eded672eb33f.zip | |
Merge branch 'master' of git://github.com/friendika/friendika
Diffstat (limited to 'mod/salmon.php')
| -rw-r--r-- | mod/salmon.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mod/salmon.php b/mod/salmon.php index 3c62a6d8c..2ae6aa628 100644 --- a/mod/salmon.php +++ b/mod/salmon.php @@ -201,7 +201,9 @@ function salmon_post(&$a) { // consume_feed will only accept a follow activity from this person if there is no contact record. - consume_feed($feedxml,$importer,((count($r)) ? $r[0] : null),$hub); + $contact_rec = ((count($r)) ? $r[0] : null); + + consume_feed($feedxml,$importer,$contact_rec,$hub); salmon_return(200); } |