Fix for relative protocol on assets

cakephp · Aug 3, 2013 · db6d0a7 · db6d0a7
1 parent 316c658
commit db6d0a7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/lib/Cake/Test/Case/View/Helper/HtmlHelperTest.php b/lib/Cake/Test/Case/View/Helper/HtmlHelperTest.php
@@ -414,6 +414,9 @@ public function testImageTag() {
 
 		$result = $this->Html->image('test.gif', array('pathPrefix' => 'http://cakephp.org/assets/img/'));
 		$this->assertTags($result, array('img' => array('src' => 'http://cakephp.org/assets/img/test.gif', 'alt' => '')));
+
+		$result = $this->Html->image('test.gif', array('pathPrefix' => '//cakephp.org/assets/img/'));
+		$this->assertTags($result, array('img' => array('src' => '//cakephp.org/assets/img/test.gif', 'alt' => '')));
 	}
 
 /**

diff --git a/lib/Cake/View/Helper.php b/lib/Cake/View/Helper.php
@@ -322,7 +322,7 @@ public function assetUrl($path, $options = array()) {
 		) {
 			$path .= $options['ext'];
 		}
-		if (strpos($path, '://') !== false) {
+		if (preg_match('|^([a-z0-9]+:)?//|', $path)) {
 			return $path;
 		}
 		if (isset($plugin)) {