Przeglądaj źródła

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
Alexandre Alapetite 2 miesięcy temu
rodzic
commit
db16450b93

+ 1 - 1
lib/composer.json

@@ -14,7 +14,7 @@
 		"marienfressinaud/lib_opml": "0.5.1",
 		"phpgt/cssxpath": "v1.4.0",
 		"phpmailer/phpmailer": "7.0.1",
-		"simplepie/simplepie": "dev-freshrss#02d08ffe43b7e93239f90f7d700475891cefcef8"
+		"simplepie/simplepie": "dev-freshrss#ecc7ef140142d0fc224128efb10b48322b5f707c"
 	},
 	"config": {
 		"sort-packages": true,

+ 1 - 1
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);

+ 1 - 1
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;
             }
         }
 

+ 1 - 1
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);