vitalif
/
FeedOnFeeds
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge with CustIS r1621 

Remove STRAIGHT_JOIN - MariaDB 5.5 handles this query optimally
Add application/x-rss+xml MIME type
master
vitalif 2012-11-13 14:29:53 +00:00
parent 5a19d20c55
commit c9a812e7f2
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fof-db.php
View File

@ -353,7 +353,8 @@ function fof_db_get_items($user_id = 1, $feed = NULL, $what = "unread",
}
$args = array();
$select = "SELECT SQL_NO_CACHE STRAIGHT_JOIN i.* , f.*, s.subscription_prefs ";
// FIXME Add STRAIGHT_JOIN here for MySQL < 5.5
$select = "SELECT SQL_NO_CACHE i.* , f.*, s.subscription_prefs ";
$from = "$FOF_ITEM_TABLE i, $FOF_FEED_TABLE f, $FOF_SUBSCRIPTION_TABLE s ";
$where = "WHERE s.user_id=$user_id AND s.feed_id=f.feed_id AND f.feed_id=i.feed_id ";

2
simplepie/simplepie.php
View File

@ -14169,7 +14169,7 @@ class SimplePie_Locator
{
$sniffer = new $this->content_type_sniffer_class($file);
$sniffed = $sniffer->get_type();
if (in_array($sniffed, array('application/rss+xml', 'application/rdf+xml', 'text/rdf', 'application/atom+xml', 'text/xml', 'application/xml')))
if (in_array($sniffed, array('application/x-rss+xml', 'application/rss+xml', 'application/rdf+xml', 'text/rdf', 'application/atom+xml', 'text/xml', 'application/xml')))
{
return true;
}

6
simplepie/simplepie.php.diff
View File

@ -1,5 +1,5 @@
--- simplepie.php 2011-10-16 03:06:55.785282901 +0400
+++ simplepie.php 2011-10-16 02:14:13.797281143 +0400
--- simplepie.php.orig 2012-11-08 14:51:05.000000000 +0400
+++ simplepie.php 2012-11-08 14:50:18.000000000 +0400
@@ -43,6 +43,10 @@
* @todo phpDoc comments
*/
@ -1039,7 +1039,7 @@
- $sniffer =& new $this->content_type_sniffer_class($file);
+ $sniffer = new $this->content_type_sniffer_class($file);
$sniffed = $sniffer->get_type();
if (in_array($sniffed, array('application/rss+xml', 'application/rdf+xml', 'text/rdf', 'application/atom+xml', 'text/xml', 'application/xml')))
if (in_array($sniffed, array('application/x-rss+xml', 'application/rss+xml', 'application/rdf+xml', 'text/rdf', 'application/atom+xml', 'text/xml', 'application/xml')))
{
@@ -14204,7 +14231,7 @@ class SimplePie_Locator
if (!in_array($href, $done) && in_array('feed', $rel) || (in_array('alternate', $rel) && !empty($link['attribs']['type']['data']) && in_array(strtolower(SimplePie_Misc::parse_mime($link['attribs']['type']['data'])), array('application/rss+xml', 'application/atom+xml'))) && !isset($feeds[$href]))