Merge branch 'pull'

[friendica.git] / include / Scrape.php

diff --git a/include/Scrape.php b/include/Scrape.php
old mode 100755 (executable)
new mode 100644 (file)
index 4c4ad3c..9c23791
--- a/include/Scrape.php
+++ b/include/Scrape.php
@@ -255,6 +255,11 @@ function scrape_feed($url) {
                                }
                        }
                }
+               // perhaps an RSS version 1 feed with a generic or incorrect content-type?
+               if(stristr($s,'</item>')) {
+                       $ret['feed_rss'] = $url;
+                       return $ret;
+               }
        }
 
        try {
@@ -679,7 +684,7 @@ function probe_url($url, $mode = PROBE_NORMAL) {
 
        if(! x($vcard,'photo')) {
                $a = get_app();
-               $vcard['photo'] = $a->get_baseurl() . '/images/default-profile.jpg' ; 
+               $vcard['photo'] = $a->get_baseurl() . '/images/person-175.jpg' ; 
        }
 
        if(! $profile)