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

// Improve dispatcher routes

Browse Source
This commit is contained in:
rMalie
2012-03-28 10:06:03 +00:00
parent 5cb46617e1
commit afad014e5f
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Dispatcher.php
+9 -2
View File
@@ -406,10 +406,17 @@ class DispatcherCore
'append' => stripslashes($append), 'append' => stripslashes($append),
); );
$prepend_regexp = $append_regexp = '';
if ($prepend || $append)
{
$prepend_regexp = '('.preg_quote($prepend);
$append_regexp = preg_quote($append).')?';
}
if (isset($keywords[$keyword]['param'])) if (isset($keywords[$keyword]['param']))
$regexp = str_replace($m[0][$i], (($prepend) ? '('.$prepend.')?' : '').'(?P<'.$keywords[$keyword]['param'].'>'.$keywords[$keyword]['regexp'].')'.(($append) ? '('.$append.')?' : ''), $regexp); $regexp = str_replace($m[0][$i], $prepend_regexp.'(?P<'.$keywords[$keyword]['param'].'>'.$keywords[$keyword]['regexp'].')'.$append_regexp, $regexp);
else else
$regexp = str_replace($m[0][$i], (($prepend) ? '('.$prepend.')?' : '').'('.$keywords[$keyword]['regexp'].')'.(($append) ? '('.$append.')?' : ''), $regexp); $regexp = str_replace($m[0][$i], $prepend_regexp.'('.$keywords[$keyword]['regexp'].')'.$append_regexp, $regexp);
} }
$keywords = $transform_keywords; $keywords = $transform_keywords;