probe for very old (0.97 or 1.0) RSS feed with an incorrect or generic content-type

diff --git a/boot.php b/boot.php
index aee236de33895cfc56fede5754736a984f11b9fd..d3da853fa904a320933e8d1e05734f57d6632b1f 100755 (executable)
--- a/boot.php
+++ b/boot.php
@@ -9,7 +9,7 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '2.3.1267' );
+define ( 'FRIENDICA_VERSION',      '2.3.1268' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.22'    );
 define ( 'DB_UPDATE_VERSION',      1130      );
 

diff --git a/include/Scrape.php b/include/Scrape.php
index 4c4ad3cdb935233d35bc820ff2b607c5c06553da..8344aa7373338d6dc938dbb0ccaf318f8588327d 100755 (executable)
--- 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 {