diff options
| author | 2026-01-17 12:09:04 +0100 | |
|---|---|---|
| committer | 2026-01-17 12:09:04 +0100 | |
| commit | db16450b93e300c22867823a27fa5c02f59f03db (patch) | |
| tree | 912a77802a716f5cd74bd2a1a986b671e8a2ce0e /lib/simplepie | |
| parent | 307b527279aa3d3911a5bf411433df4be2093022 (diff) | |
Bump SimplePie (#8443)
* https://github.com/FreshRSS/simplepie/pull/68
* https://github.com/FreshRSS/simplepie/pull/69
fix https://github.com/FreshRSS/FreshRSS/issues/8441
Diffstat (limited to 'lib/simplepie')
| -rw-r--r-- | lib/simplepie/simplepie/src/File.php | 2 | ||||
| -rw-r--r-- | lib/simplepie/simplepie/src/Item.php | 2 | ||||
| -rw-r--r-- | lib/simplepie/simplepie/src/Sanitize.php | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/simplepie/simplepie/src/File.php b/lib/simplepie/simplepie/src/File.php index a5396e576..873509d54 100644 --- a/lib/simplepie/simplepie/src/File.php +++ b/lib/simplepie/simplepie/src/File.php @@ -123,7 +123,7 @@ class File implements Response } if (version_compare(\SimplePie\Misc::get_curl_version(), '7.21.6', '>=')) { curl_setopt($fp, CURLOPT_ACCEPT_ENCODING, ''); - } elseif (version_compare(\SimplePie\Misc::get_curl_version(), '7.10.5', '>=')) { + } else { curl_setopt($fp, CURLOPT_ENCODING, ''); } curl_setopt($fp, CURLOPT_URL, $url); diff --git a/lib/simplepie/simplepie/src/Item.php b/lib/simplepie/simplepie/src/Item.php index 978cf518c..d638250cc 100644 --- a/lib/simplepie/simplepie/src/Item.php +++ b/lib/simplepie/simplepie/src/Item.php @@ -677,7 +677,7 @@ class Item implements RegistryAware return $this->data['date']['parsed']; default: - return date($date_format, $this->data['date']['parsed']); + return $this->data['date']['parsed'] !== null ? date($date_format, $this->data['date']['parsed']) : null; } } diff --git a/lib/simplepie/simplepie/src/Sanitize.php b/lib/simplepie/simplepie/src/Sanitize.php index df1176b75..9918a5171 100644 --- a/lib/simplepie/simplepie/src/Sanitize.php +++ b/lib/simplepie/simplepie/src/Sanitize.php @@ -697,7 +697,7 @@ class Sanitize implements RegistryAware $parent = $element->parentNode; if (!in_array($tag, ['html', 'head', 'body', 'div'], true) && !isset($this->allowed_html_elements_with_attributes[$tag])) { - if (!in_array($tag, ['script', 'style', 'svg', 'math'], true)) { + if (!in_array($tag, ['script', 'style', 'svg', 'math', 'template'], true)) { // Preserve children inside the disallowed element for ($i = $element->childNodes->length - 1; $i >= 0; $i--) { $child = $element->childNodes->item($i); |
