diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Symfony\Component\Routing\Route::setRequirements() _method requirement can be an array, no substr on it

Browse Source
This commit is contained in:
Sébastien HOUZE 2010-08-24 13:45:14 +02:00 committed by Fabien Potencier
parent 4c17ce8e5e
commit 179fe8e623
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Symfony/Component/Routing/Route.php
View File

@ -197,12 +197,14 @@ class Route
{ {
$this->requirements = array(); $this->requirements = array();
foreach ($requirements as $key => $regex) { foreach ($requirements as $key => $regex) {
if ('^' == $regex[0]) { if (!is_array($regex)) {
$regex = substr($regex, 1); if ('^' == $regex[0]) {
} $regex = substr($regex, 1);
}
if ('$' == substr($regex, -1)) { if ('$' == substr($regex, -1)) {
$regex = substr($regex, 0, -1); $regex = substr($regex, 0, -1);
}
} }
$this->requirements[$key] = $regex; $this->requirements[$key] = $regex;