diff options
| author | Alexandre Alapetite <alexandre@alapetite.fr> | 2025-03-15 11:53:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-15 11:53:34 +0100 |
| commit | a607407f4b71eb29887fa1c95aa6d0aaf7917e22 (patch) | |
| tree | 2a2cab8cf3d33858b01cd3cc4ff846ebe48b4885 | |
| parent | f49e5cc7feb35c605ebe397fbed2c7c45b45effc (diff) | |
| download | freshrss-a607407f4b71eb29887fa1c95aa6d0aaf7917e22.tar.gz freshrss-a607407f4b71eb29887fa1c95aa6d0aaf7917e22.zip | |
SimplePie sync upstream (#7434)
https://github.com/FreshRSS/simplepie/pull/34
| -rw-r--r-- | CHANGELOG.md | 5 | ||||
| -rw-r--r-- | lib/composer.json | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 623b6840e..7bb1285cb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,9 @@ See also [the FreshRSS releases](https://github.com/FreshRSS/FreshRSS/releases). * Apache: add check for `mod_filter` to ensure that `AddOutputFilterByType` works [#7419](https://github.com/FreshRSS/FreshRSS/pull/7419) * UI * New size option for the *Mark as read* button [#7314](https://github.com/FreshRSS/FreshRSS/pull/7314) +* SimplePie + * Merged upstream [#7434](https://github.com/FreshRSS/FreshRSS/pull/7434) + * Upstream fix [simplepie#912](https://github.com/simplepie/simplepie/pull/912) ## 2025-03-13 FreshRSS 1.26.1 @@ -360,7 +363,7 @@ Security * Fix shortcut for clipboard sharing [#6277](https://github.com/FreshRSS/FreshRSS/pull/6277) * Fix user-query filter display [#6421](https://github.com/FreshRSS/FreshRSS/pull/6421) * SimplePie - * Fix absolutize URL for several cases [#6270](https://github.com/FreshRSS/FreshRSS/pull/6270), [simplepie/#861](https://github.com/simplepie/simplepie/pull/861) + * Fix absolutize URL for several cases [#6270](https://github.com/FreshRSS/FreshRSS/pull/6270), [simplepie#861](https://github.com/simplepie/simplepie/pull/861) * Security * Replace `iframe` `allow` attribute [#6274](https://github.com/FreshRSS/FreshRSS/pull/6274) * Deployment diff --git a/lib/composer.json b/lib/composer.json index c8cea3715..970f0a994 100644 --- a/lib/composer.json +++ b/lib/composer.json @@ -14,7 +14,7 @@ "marienfressinaud/lib_opml": "0.5.1", "phpgt/cssxpath": "v1.3.0", "phpmailer/phpmailer": "6.9.3", - "simplepie/simplepie": "dev-freshrss#d7e513f3366b8f26fd32643544f839d0a789abe8" + "simplepie/simplepie": "dev-freshrss#d31582a14f027a3bb72079bbb52be788ed1c6f56" }, "config": { "sort-packages": true, |