From 8d3327da3cda2a6d1a3bb55cd07a18c9b034a103 Mon Sep 17 00:00:00 2001
From: Taylor Otwell <taylorotwell@gmail.com>
Date: Mon, 7 Nov 2011 22:53:59 -0600
Subject: [PATCH] ditched filter shortcuts

---
 laravel/routing/controller.php | 40 ++++------------------------------
 1 file changed, 4 insertions(+), 36 deletions(-)

diff --git a/laravel/routing/controller.php b/laravel/routing/controller.php
index 596ce686..608fbd25 100644
--- a/laravel/routing/controller.php
+++ b/laravel/routing/controller.php
@@ -137,55 +137,23 @@ protected static function hidden($method)
 	}
 
 	/**
-	 * Set "after" filters on the controller's methods.
+	 * Set filters on the controller's methods.
 	 *
 	 * Generally, this method will be used in the controller's constructor.
 	 *
 	 * <code>
 	 *		// Set a "foo" before filter on the controller
-	 *		$this->before_filter('foo');
+	 *		$this->filter('before', 'foo');
 	 *
 	 *		// Set several filters on an explicit group of methods
-	 *		$this->before_filter('foo|bar')->only(array('user', 'profile'));
+	 *		$this->filter('after', 'foo|bar')->only(array('user', 'profile'));
 	 * </code>
 	 *
-	 * @param  string|array       $filters
-	 * @return Filter_Collection
-	 */
-	public function before_filter($filters)
-	{
-		return $this->filter('before', $filters);
-	}
-
-	/**
-	 * Set "after" filters on the controller's methods.
-	 *
-	 * Generally, this method will be used in the controller's constructor.
-	 *
-	 * <code>
-	 *		// Set a "foo" after filter on the controller
-	 *		$this->after_filter('foo');
-	 *
-	 *		// Set several filters on an explicit group of methods
-	 *		$this->after_filter('foo|bar')->only(array('user', 'profile'));
-	 * </code>
-	 *
-	 * @param  string|array       $filters
-	 * @return Filter_Collection
-	 */
-	public function after_filter($filters)
-	{
-		return $this->filter('after', $filters);
-	}
-
-	/**
-	 * Set filters on the controller's methods.
-	 *
 	 * @param  string             $name
 	 * @param  string|array       $filters
 	 * @return Filter_Collection
 	 */
-	protected function filter($name, $filters)
+	public function filter($name, $filters)
 	{
 		$this->filters[] = new Filter_Collection($name, $filters);