sambuc/Pico-Search
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cleaned up regular expressions by using a more appropriate delimiter

Browse Source
This commit is contained in:
pontus.horn
2016-08-25 19:50:13 +02:00
parent 36fd7e1da8
commit 5db2cb4f7c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
40-PicoSearch.php
View File

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