Cleaned up regular expressions by using a more appropriate delimiter

This commit is contained in:
pontus.horn
2016-08-25 19:50:13 +02:00
parent 36fd7e1da8
commit 5db2cb4f7c

View File

@@ -28,12 +28,12 @@ class PicoSearch extends AbstractPicoPlugin
public function onRequestUrl(&$url)
{
// If form was submitted without being intercepted by JavaScript, redirect to the canonical search URL.
if (preg_match('/^(.+\/)?search$/', $url) && $_GET['q']) {
if (preg_match('~^(.+/)?search$~', $url) && $_GET['q']) {
header('Location: ' . $this->getPico()->getBaseUrl() . $url . '/' . urlencode($_GET['q']));
exit;
}
if (preg_match('/^(.+\/)?search\/([^\/]+)(\/.+)?$/', $url, $matches)) {
if (preg_match('~^(.+/)?search/([^/]+)(/.+)?$~', $url, $matches)) {
$this->search_terms = urldecode($matches[2]);
if (!empty($matches[1])) {