diff options
| author | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-01-25 08:53:39 +0100 |
|---|---|---|
| committer | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-01-25 08:53:39 +0100 |
| commit | bb1afd867d1b7bd98930108727b88a066af9749d (patch) | |
| tree | 1dd91abe675ad2b8c98dccba6930144e1f73b33c /mod/follow.php | |
| parent | 35918a9f1fd7539156fe4e5edaf2542da0c9931a (diff) | |
| parent | b0ab3e468b5c20cfe369ff282b7906d1690a3510 (diff) | |
| download | volse-hubzilla-bb1afd867d1b7bd98930108727b88a066af9749d.tar.gz volse-hubzilla-bb1afd867d1b7bd98930108727b88a066af9749d.tar.bz2 volse-hubzilla-bb1afd867d1b7bd98930108727b88a066af9749d.zip | |
Merge branch 'master' of git://github.com/friendika/friendika
Diffstat (limited to 'mod/follow.php')
| -rw-r--r-- | mod/follow.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mod/follow.php b/mod/follow.php index e5eb7763b..bad2e74f9 100644 --- a/mod/follow.php +++ b/mod/follow.php @@ -74,8 +74,8 @@ function follow_post(&$a) { $ret = scrape_feed($url); - if(count($ret) && $ret['feed_atom']) { - $poll = $ret['feed_atom']; + if(count($ret) && ($ret['feed_atom'] || $ret['feed_rss'])) { + $poll = ((x($ret,'feed_atom')) ? $ret['feed_atom'] : $ret['feed_rss']); $vcard = array(); require_once('simplepie/simplepie.inc'); $feed = new SimplePie(); @@ -115,7 +115,6 @@ function follow_post(&$a) { logger('follow: poll=' . $poll . ' notify=' . $notify . ' profile=' . $profile . ' vcard=' . print_r($vcard,true)); - // do we have enough information? if(! ((x($vcard['fn'])) && ($poll) && ($profile))) { |