diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2016-09-27 23:02:34 +0200 |
|---|---|---|
| committer | Alexandre Alapetite <alexandre@alapetite.fr>
| 2016-09-27 23:02:34 +0200 |
| commit | 90164df068783f32fee9ca445c99b340004a13c7 (patch) | |
| tree | b1e184c5bf090ccf82126d0b8cba7a744018bdf8 /lib | |
| parent | c1c5279109782537cf7d6b6b2664af2a0990fb16 (diff) | |
| parent | 1d87ebe9dd607a8e4da395d102763b62a94ac02b (diff) | |
Merge branch 'FreshRSS/dev' into PostgreSQL
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/SimplePie/SimplePie/Content/Type/Sniffer.php | 8 |
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(); } |