summaryrefslogtreecommitdiff
path: root/app/models/Feed.php
diff options
context:
space:
mode:
authorGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2013-09-14 11:16:54 -0700
committerGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2013-09-14 11:16:54 -0700
commit980b1ef26ca766469486576b88a3dab95d9c0a29 (patch)
tree41b7eb97fece942e003c87a83846c2d8b3b611f8 /app/models/Feed.php
parent06236ba4463848b1f75fae58ee2ae4d995e273c9 (diff)
parentf2697be658870fc57b42d8282a10155ecf64bc69 (diff)
Merge pull request #152 from Alkarex/AvoidPregReplace
Avoid preg_replace() for simple cases
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 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 ('/&amp;/', '&', $this->url);
+ $url = str_replace ('&amp;', '&', $this->url);
if ($this->httpAuth != '') {
$url = preg_replace ('#((.+)://)(.+)#', '${1}' . $this->httpAuth . '@${3}', $url);
}