dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[-] Core : prepend/append are now a little more optionnal in the routes for the dispatcher

Browse Source
This commit is contained in:
Damien Metzger
2013-01-29 15:59:49 +01:00
parent 6ad12164b5
commit cf83821c60
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Dispatcher.php
+5 -5
View File
@@ -468,7 +468,7 @@ class DispatcherCore
if ($keywords) if ($keywords)
{ {
$transform_keywords = array(); $transform_keywords = array();
preg_match_all('#\\\{(([^{}]+)\\\:)?('.implode('|', array_keys($keywords)).')(\\\:([^{}]+))?\\\}#', $regexp, $m); preg_match_all('#\\\{(([^{}]*)\\\:)?('.implode('|', array_keys($keywords)).')(\\\:([^{}]*))?\\\}#', $regexp, $m);
for ($i = 0, $total = count($m[0]); $i < $total; $i++) for ($i = 0, $total = count($m[0]); $i < $total; $i++)
{ {
$prepend = $m[2][$i]; $prepend = $m[2][$i];
@@ -537,7 +537,7 @@ class DispatcherCore
if (!isset($this->routes[$id_lang]) && !isset($this->routes[$id_lang][$route_id])) if (!isset($this->routes[$id_lang]) && !isset($this->routes[$id_lang][$route_id]))
return false; return false;
return preg_match('#\{([^{}]+:)?'.preg_quote($keyword, '#').'(:[^{}])?\}#', $this->routes[$id_lang][$route_id]['rule']); return preg_match('#\{([^{}]*:)?'.preg_quote($keyword, '#').'(:[^{}]*)?\}#', $this->routes[$id_lang][$route_id]['rule']);
} }
/** /**
@@ -554,7 +554,7 @@ class DispatcherCore
return false; return false;
foreach ($this->default_routes[$route_id]['keywords'] as $keyword => $data) foreach ($this->default_routes[$route_id]['keywords'] as $keyword => $data)
if (isset($data['param']) && !preg_match('#\{([^{}]+:)?'.$keyword.'(:[^{}])?\}#', $rule)) if (isset($data['param']) && !preg_match('#\{([^{}]*:)?'.$keyword.'(:[^{}]*)?\}#', $rule))
$errors[] = $keyword; $errors[] = $keyword;
return (count($errors)) ? false : true; return (count($errors)) ? false : true;
@@ -614,10 +614,10 @@ class DispatcherCore
$replace = $route['keywords'][$key]['prepend'].$params[$key].$route['keywords'][$key]['append']; $replace = $route['keywords'][$key]['prepend'].$params[$key].$route['keywords'][$key]['append'];
else else
$replace = ''; $replace = '';
$url = preg_replace('#\{([^{}]+:)?'.$key.'(:[^{}])?\}#', $replace, $url); $url = preg_replace('#\{([^{}]*:)?'.$key.'(:[^{}]*)?\}#', $replace, $url);
} }
} }
$url = preg_replace('#\{([^{}]+:)?[a-z0-9_]+?(:[^{}])?\}#', '', $url); $url = preg_replace('#\{([^{}]*:)?[a-z0-9_]+?(:[^{}]*)?\}#', '', $url);
if (count($add_param)) if (count($add_param))
$url .= '?'.http_build_query($add_param, '', '&'); $url .= '?'.http_build_query($add_param, '', '&');
} }