diff options
| author | Bernhard Posselt <BernhardPosselt@users.noreply.github.com> | 2015-11-02 21:01:51 +0100 |
|---|---|---|
| committer | Bernhard Posselt <BernhardPosselt@users.noreply.github.com> | 2015-11-02 21:01:51 +0100 |
| commit | 0ef5339021228cc76164047b4ac1b6a3f02c4228 (patch) | |
| tree | 0a67f1acb529385483e79d5e390fadc2f7206e8f | |
| parent | 1f3312a0779dd658be555285f3cc208d2e5156bf (diff) | |
| parent | e970ca9328a9485d83c4804973ac98d93f93b523 (diff) | |
Merge pull request #883 from owncloud/apos-cleanup
apos is handled by html_decode since php 5.4.0
| -rw-r--r-- | fetcher/feedfetcher.php | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/fetcher/feedfetcher.php b/fetcher/feedfetcher.php index 60bb404df..6b7460679 100644 --- a/fetcher/feedfetcher.php +++ b/fetcher/feedfetcher.php @@ -140,15 +140,11 @@ class FeedFetcher implements IFeedFetcher { private function decodeTwice($string) { - // behold! ' is not converted by PHP that's why we need to do it - // manually (TM) - return str_replace(''', '\'', + return html_entity_decode( html_entity_decode( - html_entity_decode( - $string, ENT_QUOTES, 'UTF-8' - ), - ENT_QUOTES, 'UTF-8' - ) + $string, ENT_QUOTES | ENT_HTML5, 'UTF-8' + ), + ENT_QUOTES | ENT_HTML5, 'UTF-8' ); } |