Merge branch 'dev' of github.com:marienfressinaud/FreshRSS into dev

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);
 				}

app/views/entry/bookmark.phtml

@@ -12,4 +12,4 @@ $url = Url::display (array (
 	'params' => Request::params (),
 ));
 
-echo json_encode (array ('url' => preg_replace ('#&#i', '&', $url)));
+echo json_encode (array ('url' => str_ireplace ('&', '&', $url)));

app/views/entry/read.phtml

@@ -12,4 +12,4 @@ $url = Url::display (array (
 	'params' => Request::params (),
 ));
 
-echo json_encode (array ('url' => preg_replace ('#&#i', '&', $url)));
+echo json_encode (array ('url' => str_ireplace ('&', '&', $url)));