Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-02-10 16:47:49 +01:00
Code Issues Packages Projects Releases Activity

Fix params regex not taking into consideration param separators other than :

Browse Source
This commit is contained in:
Flavio Copes
2016-06-20 18:51:57 +02:00
parent d1cb75b6a2
commit 1bf4428752
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
system/src/Grav/Common/Uri.php
View File

@@ -12,7 +12,6 @@ use Grav\Common\Page\Page;
class Uri
{
const HOSTNAME_REGEX = '/^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])$/';
const PARAMS_REGEX = '/\/([^\:\#\/\?]*:[^\:\#\/\?]*)/';
public $url;
@@ -72,6 +71,16 @@ class Uri
return $hostname;
}
/**
* Calculate the parameter regex based on the param_sep setting
*
* @return string
*/
public function paramsRegex()
{
return '/\/([^\:\#\/\?]*' . Grav::instance()['config']->get('system.param_sep') . '[^\:\#\/\?]*)/';
}
/**
* Validate a hostname
@@ -350,7 +359,7 @@ class Uri
private function processParams($uri, $delimiter = ':')
{
if (strpos($uri, $delimiter) !== false) {
preg_match_all(Uri::PARAMS_REGEX, $uri, $matches, PREG_SET_ORDER);
preg_match_all(Uri::paramsRegex(), $uri, $matches, PREG_SET_ORDER);
foreach ($matches as $match) {
$param = explode($delimiter, $match[1]);
@@ -937,7 +946,7 @@ class Uri
$params = [];
if (strpos($uri, $delimiter) !== false) {
preg_match_all(Uri::PARAMS_REGEX, $uri, $matches, PREG_SET_ORDER);
preg_match_all(Uri::paramsRegex(), $uri, $matches, PREG_SET_ORDER);
foreach ($matches as $match) {
$param = explode($delimiter, $match[1]);