From 4c5e091b784574337c7124b7763bbd19f4bc810f Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Mon, 4 Apr 2011 20:40:31 -0700
Subject: better twitter follow support

---
 mod/follow.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'mod')

diff --git a/mod/follow.php b/mod/follow.php
index 06e81ceed..48ad66747 100644
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -112,6 +112,8 @@ function follow_post(&$a) {
 		if(count($ret) && ($ret['feed_atom'] || $ret['feed_rss'])) {
 			$poll = ((x($ret,'feed_atom')) ? unamp($ret['feed_atom']) : unamp($ret['feed_rss']));
 			$vcard = array();
+				if(x($ret,'photo'))
+					$vcard['photo'] = $ret['photo'];
 			require_once('simplepie/simplepie.inc');
 		    $feed = new SimplePie();
 			$xml = fetch_url($poll);
@@ -120,7 +122,8 @@ function follow_post(&$a) {
 
 		    $feed->init();
 
-			$vcard['photo'] = $feed->get_image_url();
+			if(! x($vcard,'photo'))
+				$vcard['photo'] = $feed->get_image_url();
 			$author = $feed->get_author();
 			if($author) {			
 				$vcard['fn'] = unxmlify(trim($author->get_name()));
-- 
cgit v1.2.3