Route->uri() should always add the default parameters, fixes #1970

kohana · Aug 20, 2009 · f55d3ec · f55d3ec
1 parent 3f6919b
commit f55d3ec
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/classes/kohana/route.php b/classes/kohana/route.php
@@ -257,6 +257,11 @@ public function uri(array $params = NULL)
 			// Use the default parameters
 			$params = $this->_defaults;
 		}
+		else
+		{
+			// Add the default parameters
+			$params += $this->_defaults;
+		}
 
 		// Start with the routed URI
 		$uri = $this->_uri;