aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-03-01 18:49:23 -0800
committerfriendica <info@friendica.com>2012-03-01 18:49:23 -0800
commit58e3372b23b286334e5195b1b8f70448715ed493 (patch)
tree136bd719ce174189a5391d91f8c3de100133bef9
parentbd2c8c92f1b30d8f811bd4aab0fe3a2c5496ec61 (diff)
downloadvolse-hubzilla-58e3372b23b286334e5195b1b8f70448715ed493.tar.gz
volse-hubzilla-58e3372b23b286334e5195b1b8f70448715ed493.tar.bz2
volse-hubzilla-58e3372b23b286334e5195b1b8f70448715ed493.zip
probe for very old (0.97 or 1.0) RSS feed with an incorrect or generic content-type
-rwxr-xr-xboot.php2
-rwxr-xr-xinclude/Scrape.php5
2 files changed, 6 insertions, 1 deletions
diff --git a/boot.php b/boot.php
index aee236de3..d3da853fa 100755
--- 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 4c4ad3cdb..8344aa737 100755
--- 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 {