diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2014-05-17 12:08:47 +0200 |
|---|---|---|
| committer | Alexandre Alapetite <alexandre@alapetite.fr>
| 2014-05-17 12:08:47 +0200 |
| commit | 17a603b333f305a5a9c8fdd36468575bc1cd8f74 (patch) | |
| tree | 13d6eb2189165274fa7087f7d100d1b21eaa56bd /lib | |
| parent | c3178a4f89d247064ca97969ae1f22cce9bcd771 (diff) | |
SimplePie patch accepted
Merged into master branch of SimplePie
https://github.com/simplepie/simplepie/pull/352
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/SimplePie/SimplePie.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/SimplePie/SimplePie.php b/lib/SimplePie/SimplePie.php index d7aaeb0c5..685fe1cc0 100644 --- a/lib/SimplePie/SimplePie.php +++ b/lib/SimplePie/SimplePie.php @@ -1331,7 +1331,7 @@ class SimplePie // First check to see if input has been overridden. if ($this->input_encoding !== false) { - $encodings[] = strtoupper($this->input_encoding); //FreshRSS + $encodings[] = strtoupper($this->input_encoding); } $application_types = array('application/xml', 'application/xml-dtd', 'application/xml-external-parsed-entity'); @@ -1355,7 +1355,7 @@ class SimplePie { if (isset($headers['content-type']) && preg_match('/;\x20?charset=([^;]*)/i', $headers['content-type'], $charset)) { - $encodings[] = strtoupper($charset[1]); //FreshRSS + $encodings[] = strtoupper($charset[1]); } else { |