aboutsummaryrefslogtreecommitdiff
path: root/app/models
diff options
context:
space:
mode:
authorGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2013-09-14 17:51:33 +0200
committerGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2013-09-14 17:51:33 +0200
commitc63b52738c85ed76c795e62f3238f6cc32cc0b55 (patch)
tree6e8fa81e9b5a6f174041c944801c61a9a5563d30 /app/models
parentadc33811c3c9513ca56dfa5e57169a5a1df106db (diff)
parentda2e4e09d939f49a69cfcd0b3a450f0484f51ff9 (diff)
Merge branch 'utf8bug' of https://github.com/Alkarex/FreshRSS into Alkarex-utf8bug
Diffstat (limited to 'app/models')
-rw-r--r--app/models/Feed.php2
1 files changed, 1 insertions, 1 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 ());