Fix Router::url() in 3.0

cakephp · Aug 3, 2013 · cc1de6c · cc1de6c
1 parent a8d5052
commit cc1de6c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/lib/Cake/Routing/Router.php b/lib/Cake/Routing/Router.php
@@ -800,11 +800,7 @@ public static function url($url = null, $options = array()) {
 			if ($plainString) {
 				return $url;
 			}
-			$output = $url;
-			if ($hasLeadingSlash && strlen($output) > 1) {
-				$output = substr($output, 1);
-			}
-			$output = $base . $output;
+			$output = $base . $url;
 		}
 		$protocol = preg_match('#^[a-z][a-z0-9+\-.]*\://#i', $output);
 		if ($protocol === 0) {

diff --git a/lib/Cake/Test/TestCase/Routing/RouterTest.php b/lib/Cake/Test/TestCase/Routing/RouterTest.php
@@ -411,6 +411,12 @@ public function testUrlGenerationWithBasePath() {
 		$result = Router::url('/');
 		$this->assertEquals('/magazine/', $result);
 
+		$result = Router::url('/articles/');
+		$this->assertEquals('/magazine/articles/', $result);
+
+		$result = Router::url('/articles/view');
+		$this->assertEquals('/magazine/articles/view', $result);
+
 		$result = Router::url(['controller' => 'articles', 'action' => 'view', 1]);
 		$this->assertEquals('/magazine/articles/view/1', $result);
 	}