From 4f73200675a4090223777c96a62c283b45b44471 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Tue, 28 Jun 2011 23:26:42 -0500 Subject: [PATCH] moved route filter to route directory. --- public/index.php | 4 ++-- system/route.php | 4 ++-- system/{ => route}/filter.php | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) rename system/{ => route}/filter.php (97%) diff --git a/public/index.php b/public/index.php index f813717e..6375c304 100644 --- a/public/index.php +++ b/public/index.php @@ -83,7 +83,7 @@ if (System\Config::get('session.driver') != '') // -------------------------------------------------------------- // Execute the global "before" filter. // -------------------------------------------------------------- -$response = System\Filter::call('before', array(), true); +$response = System\Route\Filter::call('before', array(), true); // -------------------------------------------------------------- // Only execute the route function if the "before" filter did @@ -116,7 +116,7 @@ else // ---------------------------------------------------------- // Execute the global "after" filter. // ---------------------------------------------------------- -System\Filter::call('after', array($response)); +System\Route\Filter::call('after', array($response)); // ---------------------------------------------------------- // Stringify the response. diff --git a/system/route.php b/system/route.php index 8210a7f3..451bf718 100644 --- a/system/route.php +++ b/system/route.php @@ -63,7 +63,7 @@ class Route { // ------------------------------------------------------------ elseif (is_array($this->callback)) { - $response = isset($this->callback['before']) ? Filter::call($this->callback['before'], array(), true) : null; + $response = isset($this->callback['before']) ? Route\Filter::call($this->callback['before'], array(), true) : null; // ------------------------------------------------------------ // We verify that the before filters did not return a response @@ -80,7 +80,7 @@ class Route { if (is_array($this->callback) and isset($this->callback['after'])) { - Filter::call($this->callback['after'], array($response)); + Route\Filter::call($this->callback['after'], array($response)); } return $response; diff --git a/system/filter.php b/system/route/filter.php similarity index 97% rename from system/filter.php rename to system/route/filter.php index e3ca5500..6b1c59f7 100644 --- a/system/filter.php +++ b/system/route/filter.php @@ -1,4 +1,4 @@ -