From db6d0a748b42c3d44016d9a0696076b69de19cf5 Mon Sep 17 00:00:00 2001 From: Juan Basso Date: Tue, 28 May 2013 00:02:49 -0400 Subject: [PATCH] Fix for relative protocol on assets --- lib/Cake/Test/Case/View/Helper/HtmlHelperTest.php | 3 +++ lib/Cake/View/Helper.php | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/Cake/Test/Case/View/Helper/HtmlHelperTest.php b/lib/Cake/Test/Case/View/Helper/HtmlHelperTest.php index 490c55d1c..adc90c067 100644 --- a/lib/Cake/Test/Case/View/Helper/HtmlHelperTest.php +++ b/lib/Cake/Test/Case/View/Helper/HtmlHelperTest.php @@ -414,6 +414,9 @@ class HtmlHelperTest extends CakeTestCase { $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 index 45538048b..59cfbf89f 100644 --- a/lib/Cake/View/Helper.php +++ b/lib/Cake/View/Helper.php @@ -322,7 +322,7 @@ class Helper extends Object { ) { $path .= $options['ext']; } - if (strpos($path, '://') !== false) { + if (preg_match('|^([a-z0-9]+:)?//|', $path)) { return $path; } if (isset($plugin)) {