aboutsummaryrefslogtreecommitdiff
path: root/app/models/Feed.php
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2013-11-26 23:52:53 +0100
committerGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2013-11-26 23:53:22 +0100
commit6130ba6157fc214579a0466ec122a8f085224415 (patch)
treeb095eedbf8b6c891c803b9487ce3e36552e73dd7 /app/models/Feed.php
parentb703099c1947d26764a8e936ecb9ea58e15fbd63 (diff)
SQL : utilisation de (id_feed, guid) pour l'unicité
Préparation avant https://github.com/marienfressinaud/FreshRSS/issues/202
Diffstat (limited to 'app/models/Feed.php')
-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 822f6e703..d1d85d838 100644
--- a/app/models/Feed.php
+++ b/app/models/Feed.php
@@ -191,7 +191,7 @@ class Feed extends Model {
} else {
$feed = new SimplePie ();
$feed->set_useragent(Translate::t ('freshrss') . '/' . FRESHRSS_VERSION . ' (' . PHP_OS . '; ' . FRESHRSS_WEBSITE . ') ' . SIMPLEPIE_NAME . '/' . SIMPLEPIE_VERSION);
- $url = str_replace ('&amp;', '&', $this->url);
+ $url = htmlspecialchars_decode ($this->url, ENT_QUOTES);
if ($this->httpAuth != '') {
$url = preg_replace ('#((.+)://)(.+)#', '${1}' . $this->httpAuth . '@${3}', $url);
}