aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2016-09-25 15:56:44 +0200
committerGravatar GitHub <noreply@github.com> 2016-09-25 15:56:44 +0200
commit3870e430b1001b6a2adfa6dd228420392485488a (patch)
treeebbcddb38d2f60f64c138dcdee6ebe8ea6a25067 /lib
parent74f9aa310d301cbec18040975bdb1b7e03a99b24 (diff)
parenta37484fd2fee58d48d8e58535b34d8c63352c51e (diff)
Merge pull request #1265 from Alkarex/SimplePie-autodiscovery-xml
Fix SimplePie autodiscovery for text/xml HTML pages
Diffstat (limited to 'lib')
-rw-r--r--lib/SimplePie/SimplePie/Content/Type/Sniffer.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/SimplePie/SimplePie/Content/Type/Sniffer.php b/lib/SimplePie/SimplePie/Content/Type/Sniffer.php
index a32f47f59..daec3607d 100644
--- a/lib/SimplePie/SimplePie/Content/Type/Sniffer.php
+++ b/lib/SimplePie/SimplePie/Content/Type/Sniffer.php
@@ -109,9 +109,7 @@ class SimplePie_Content_Type_Sniffer
{
return $this->unknown();
}
- elseif (substr($official, -4) === '+xml'
- || $official === 'text/xml'
- || $official === 'application/xml')
+ elseif (substr($official, -4) === '+xml')
{
return $official;
}
@@ -126,7 +124,9 @@ class SimplePie_Content_Type_Sniffer
return $official;
}
}
- elseif ($official === 'text/html')
+ elseif ($official === 'text/html'
+ || $official === 'text/xml'
+ || $official === 'application/xml')
{
return $this->feed_or_html();
}