From 8a8d3319812d4e3974efd43c90376bc0362e8d5e Mon Sep 17 00:00:00 2001
From: Daniel Petrie <dan.petrie@cartalyst.com>
Date: Wed, 9 May 2012 17:14:01 -0700
Subject: [PATCH] Update laravel/routing/controller.php

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

diff --git a/laravel/routing/controller.php b/laravel/routing/controller.php
index fb03abd3..4e6b4b90 100644
--- a/laravel/routing/controller.php
+++ b/laravel/routing/controller.php
@@ -154,9 +154,9 @@ abstract class Controller {
 		// improve speed since the bundle is not loaded on every request.
 		Bundle::start($bundle);
 
-		list($controller, $method) = explode('@', $destination);
+		list($controller_name, $method) = explode('@', $destination);
 
-		$controller = static::resolve($bundle, $controller);
+		$controller = static::resolve($bundle, $controller_name);
 		
 		$controller->bundle = $bundle;
 		$controller->name   = $controller_name;