diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2013-09-14 17:51:33 +0200 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2013-09-14 17:51:33 +0200 |
| commit | c63b52738c85ed76c795e62f3238f6cc32cc0b55 (patch) | |
| tree | 6e8fa81e9b5a6f174041c944801c61a9a5563d30 /app | |
| parent | adc33811c3c9513ca56dfa5e57169a5a1df106db (diff) | |
| parent | da2e4e09d939f49a69cfcd0b3a450f0484f51ff9 (diff) | |
Merge branch 'utf8bug' of https://github.com/Alkarex/FreshRSS into Alkarex-utf8bug
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/Feed.php | 2 | ||||
| -rwxr-xr-x | app/views/helpers/view/rss_view.phtml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/models/Feed.php b/app/models/Feed.php index 678809af6..0ea083d5a 100644 --- a/app/models/Feed.php +++ b/app/models/Feed.php @@ -216,7 +216,7 @@ class Feed extends Model { foreach ($feed->get_items () as $item) { $title = $item->get_title (); $title = preg_replace('#<a(.+)>(.+)</a>#', '\\2', $title); - $title = htmlentities($title); + $title = htmlentities($title, ENT_NOQUOTES, 'UTF-8'); $author = $item->get_author (); $link = $item->get_permalink (); $date = strtotime ($item->get_date ()); diff --git a/app/views/helpers/view/rss_view.phtml b/app/views/helpers/view/rss_view.phtml index 83de6de2e..8ce636918 100755 --- a/app/views/helpers/view/rss_view.phtml +++ b/app/views/helpers/view/rss_view.phtml @@ -12,7 +12,7 @@ $items = $this->entryPaginator->items (); foreach ($items as $item) { ?> <item> - <title><?php echo htmlspecialchars(html_entity_decode($item->title ())); ?></title> + <title><?php echo htmlspecialchars(html_entity_decode($item->title (), ENT_NOQUOTES, 'UTF-8'), ENT_NOQUOTES, 'UTF-8'); ?></title> <link><?php echo $item->link (); ?></link> <?php $author = $item->author (); ?> <?php if ($author != '') { ?> |