diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2013-09-14 21:17:48 +0200 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2013-09-14 21:17:48 +0200 |
| commit | 9db14d1cd3e474622a42bee40cb62ba41f4cc4b1 (patch) | |
| tree | e5f1cd92b9e2cef2f85dbf04d23ab55bcafd270d /app/models/Feed.php | |
| parent | 597a62148a17949a030afed5c62525914de84e11 (diff) | |
| parent | 619671ec6613089c6338a4112a3f40e46c17086e (diff) | |
Merge branch 'dev' into Alkarex-NbUnread
Diffstat (limited to 'app/models/Feed.php')
| -rw-r--r-- | app/models/Feed.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/Feed.php b/app/models/Feed.php index e53df16a1..b3c23d4e8 100644 --- a/app/models/Feed.php +++ b/app/models/Feed.php @@ -172,7 +172,7 @@ class Feed extends Model { ); } else { $feed = new SimplePie (); - $url = preg_replace ('/&/', '&', $this->url); + $url = str_replace ('&', '&', $this->url); if ($this->httpAuth != '') { $url = preg_replace ('#((.+)://)(.+)#', '${1}' . $this->httpAuth . '@${3}', $url); } |