Ensure the default controller param is used if a controller part was …

…not matched from the URL. Followup to 83d0f21.
kohana · Feb 13, 2012 · 2ed1d30 · Yahasana · Feb 14, 2012 · shadowhand
1 parent 83d0f21
commit 2ed1d30
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/classes/Kohana/Route.php b/classes/Kohana/Route.php
@@ -457,8 +457,11 @@ public function matches($uri)
 			}
 		}
 
-		// Ucfirst the controller, if it was matched from the URL, for PSR-0.
-		$params['controller'] = ucfirst(strtolower($params['controller']));
+		if (array_key_exists('controller', $params))
+		{
+			// Ucfirst the controller, if it was matched from the URL, for PSR-0.
+			$params['controller'] = ucfirst(strtolower($params['controller']));
+		}
 
 		foreach ($this->_defaults as $key => $value)
 		{