@@ -205,12 +205,12 @@ |
||
| 205 | 205 | |
| 206 | 206 | //Older versions of PCRE require the 'P' in (?P<named>) |
| 207 | 207 | $pattern = '(?:' |
| 208 | - . ($pre !== '' ? $pre : null) |
|
| 209 | - . '(' |
|
| 210 | - . ($param !== '' ? "?P<$param>" : null) |
|
| 211 | - . $type |
|
| 212 | - . '))' |
|
| 213 | - . ($optional !== '' ? '?' : null); |
|
| 208 | + . ($pre !== '' ? $pre : null) |
|
| 209 | + . '(' |
|
| 210 | + . ($param !== '' ? "?P<$param>" : null) |
|
| 211 | + . $type |
|
| 212 | + . '))' |
|
| 213 | + . ($optional !== '' ? '?' : null); |
|
| 214 | 214 | |
| 215 | 215 | $route = str_replace($block, $pattern, $route); |
| 216 | 216 | } |
@@ -250,7 +250,9 @@ |
||
| 250 | 250 | |
| 251 | 251 | if(in_array($requestMethod, $methods)) |
| 252 | 252 | { |
| 253 | - if($routeString == '*') return true; |
|
| 253 | + if($routeString == '*') { |
|
| 254 | + return true; |
|
| 255 | + } |
|
| 254 | 256 | |
| 255 | 257 | if(is_array($routeString) && !empty($routeString)) { |
| 256 | 258 | if($routeString[0] == '@') { |