From f2697be658870fc57b42d8282a10155ecf64bc69 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Sat, 31 Aug 2013 12:09:36 +0200 Subject: Avoid preg_replace for simple cases Use the faster str_replace() and str_ireplace() instead. From http://www.php.net/manual/function.str-replace.php : "If you don't need fancy replacing rules (like regular expressions), you should always use this function instead of preg_replace(). " --- app/models/Feed.php | 2 +- app/views/entry/bookmark.phtml | 2 +- app/views/entry/read.phtml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/Feed.php b/app/models/Feed.php index 678809af6..d55e44db9 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); } diff --git a/app/views/entry/bookmark.phtml b/app/views/entry/bookmark.phtml index fe64bb2d8..1ff1c220c 100755 --- a/app/views/entry/bookmark.phtml +++ b/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))); diff --git a/app/views/entry/read.phtml b/app/views/entry/read.phtml index 4d0a84f45..6d3313a89 100755 --- a/app/views/entry/read.phtml +++ b/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))); -- cgit v1.2.3