diff options
| author | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-01-15 08:55:19 +0100 |
|---|---|---|
| committer | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-01-15 08:55:19 +0100 |
| commit | abf976bb36503268d810b7733407caaf3351dca2 (patch) | |
| tree | c43dca8a4cff4aa84f4bedde03593968292d948a /mod/salmon.php | |
| parent | a118f83ee23d9151157500737022db018e922a9f (diff) | |
| parent | e7ae4ad3fa010e5f636738366aae81e129990fa7 (diff) | |
| download | volse-hubzilla-abf976bb36503268d810b7733407caaf3351dca2.tar.gz volse-hubzilla-abf976bb36503268d810b7733407caaf3351dca2.tar.bz2 volse-hubzilla-abf976bb36503268d810b7733407caaf3351dca2.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); } |