Merge remote-tracking branch 'upstream/develop' into develop

This commit is contained in:
Chris Berthe
2012-07-12 11:15:43 -04:00
25 changed files with 538 additions and 44 deletions

View File

@@ -213,6 +213,15 @@ class Route {
{
if (Str::is($pattern, $this->uri))
{
// If the filter provided is an array then we need to register
// the filter before we can assign it to the route.
if (is_array($filter))
{
list($filter, $callback) = array_values($filter);
Filter::register($filter, $callback);
}
$filters[] = $filter;
}
}