Applying fix from 'euromark' to fix protocol relative links

Fixes #2107
cakephp · Oct 18, 2011 · 55064b6 · 55064b6
1 parent 1d8199b
commit 55064b6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/lib/Cake/Routing/Router.php b/lib/Cake/Routing/Router.php
@@ -775,7 +775,7 @@ public static function url($url = null, $full = false) {
 			}
 		} else {
 			if (
-				(strpos($url, '://') ||
+				(strpos($url, '://') !== false ||
 				(strpos($url, 'javascript:') === 0) ||
 				(strpos($url, 'mailto:') === 0)) ||
 				(!strncmp($url, '#', 1))

diff --git a/lib/Cake/Test/Case/Routing/RouterTest.php b/lib/Cake/Test/Case/Routing/RouterTest.php
@@ -2420,6 +2420,9 @@ public function testUrlProtocol() {
 
 		$url = 'svn+ssh://example.com';
 		$this->assertEqual($url, Router::url($url));
+
+		$url = '://example.com';
+		$this->assertEqual($url, Router::url($url));
 	}
 
 /**