aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2016-10-20 23:54:54 +0200
committerGravatar GitHub <noreply@github.com> 2016-10-20 23:54:54 +0200
commit40b5d3f933e27f37894f58f99c63409f2cdd2d5a (patch)
treed182e831449400252ca62a71855804b396a59e1b /lib
parent9ffd56ea68caaaff49efefacf501e07298eca7e2 (diff)
parent0a3ab899a01cc20919881f913619ade9e6cdfba5 (diff)
Merge pull request #1337 from Alkarex/SimplePie-feed_or_html-UTF8-BOM
Add support for UTF-8 BOM in SimplePie feed_or_html()
Diffstat (limited to 'lib')
-rw-r--r--lib/SimplePie/SimplePie/Content/Type/Sniffer.php7
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/SimplePie/SimplePie/Content/Type/Sniffer.php b/lib/SimplePie/SimplePie/Content/Type/Sniffer.php
index daec3607d..ec0bf0952 100644
--- a/lib/SimplePie/SimplePie/Content/Type/Sniffer.php
+++ b/lib/SimplePie/SimplePie/Content/Type/Sniffer.php
@@ -256,7 +256,12 @@ class SimplePie_Content_Type_Sniffer
public function feed_or_html()
{
$len = strlen($this->file->body);
- $pos = strspn($this->file->body, "\x09\x0A\x0D\x20");
+ $pos = 0;
+ if (isset($this->file->body[2]) && $this->file->body[0] === "\xEF" &&
+ $this->file->body[1] === "\xBB" && $this->file->body[2] === "\xBF") {
+ $pos += 3; //UTF-8 BOM
+ }
+ $pos += strspn($this->file->body, "\x09\x0A\x0D\x20", $pos);
while ($pos < $len)
{