Unused variables in Routing removed

cakephp · Apr 22, 2011 · 3c9cb3b · 3c9cb3b
1 parent ad73c70
commit 3c9cb3b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/lib/Cake/Routing/Dispatcher.php b/lib/Cake/Routing/Dispatcher.php
@@ -299,7 +299,6 @@ public function asset($url) {
 			include WWW_ROOT . DS . $filters['js'];
 			return true;
 		}
-		$controller = null;
 		$pathSegments = explode('.', $url);
 		$ext = array_pop($pathSegments);
 		$parts = explode('/', $url);

diff --git a/lib/Cake/Routing/Route/CakeRoute.php b/lib/Cake/Routing/Route/CakeRoute.php
@@ -399,7 +399,7 @@ public function match($url) {
 		$greedyNamed = $namedConfig['greedyNamed'];
 		$allowedNamedParams = $namedConfig['rules'];
 
-		$named = $pass = $_query = array();
+		$named = $pass = array();
 
 		foreach ($url as $key => $value) {
 

diff --git a/lib/Cake/Routing/Router.php b/lib/Cake/Routing/Router.php
@@ -487,7 +487,7 @@ public static function parse($url) {
 			'named' => array()
 		);
 
-		$r = $ext = null;
+		$ext = null;
 
 		if ($url && strpos($url, '/') !== 0) {
 			$url = '/' . $url;
@@ -771,7 +771,7 @@ public static function promote($which = null) {
  * @return string Full translated URL with base path.
  */
 	public static function url($url = null, $full = false) {
-		$defaults = $params = array('plugin' => null, 'controller' => null, 'action' => 'index');
+		$params = array('plugin' => null, 'controller' => null, 'action' => 'index');
 
 		if (is_bool($full)) {
 			$escape = false;
@@ -792,7 +792,7 @@ public static function url($url = null, $full = false) {
 		}
 
 		$base = $path['base'];
-		$extension = $output = $mapped = $q = $frag = null;
+		$extension = $output = $q = $frag = null;
 
 		if (empty($url)) {
 			$output = isset($path['here']) ? $path['here'] : '/';