diff options
| author | 2014-03-22 13:22:55 +0100 | |
|---|---|---|
| committer | 2014-03-22 13:22:55 +0100 | |
| commit | 69deb27f654a0d5d5e6fe77733d56a9c4fd29e03 (patch) | |
| tree | d6fbc0511d76263881cafaa187ce7cca523b9811 /app/Models | |
| parent | d1c5db7461ecb69c529149536718baf9b73a1f2c (diff) | |
| parent | 72ae58d45534b4c8b49ea0ac33a9a9ec9df4bdb1 (diff) | |
Merge remote-tracking branch 'origin/dev' into 163-export
Diffstat (limited to 'app/Models')
| -rw-r--r-- | app/Models/Feed.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/Models/Feed.php b/app/Models/Feed.php index bce3bd24f..13d3dfe88 100644 --- a/app/Models/Feed.php +++ b/app/Models/Feed.php @@ -210,8 +210,8 @@ class FreshRSS_Feed extends Minz_Model { } if ($loadDetails) { - $title = htmlspecialchars(html_only_entity_decode($feed->get_title()), ENT_COMPAT, 'UTF-8'); - $this->_name ($title === null ? $this->url : $title); + $title = strtr(html_only_entity_decode($feed->get_title()), array('<' => '<', '>' => '>', '"' => '"')); //HTML to HTML-PRE //ENT_COMPAT except & + $this->_name ($title == '' ? $this->url : $title); $this->_website(html_only_entity_decode($feed->get_link())); $this->_description(html_only_entity_decode($feed->get_description())); |
