Allowed specifying media path using 'src' attribute

cakephp · Feb 10, 2012 · be694d8 · be694d8
1 parent bea50f5
commit be694d8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/lib/Cake/Test/Case/View/Helper/HtmlHelperTest.php b/lib/Cake/Test/Case/View/Helper/HtmlHelperTest.php
@@ -1743,6 +1743,13 @@ public function testMedia() {
 			'/video'
 		);
 		$this->assertTags($result, $expected);
+
+		$result = $this->Html->media(null, array('src' => 'video.webm'));
+		$expected = array(
+			'video' => array('src' => 'files/video.webm'),
+			'/video'
+		);
+		$this->assertTags($result, $expected);
 	}
 
 /**

diff --git a/lib/Cake/View/Helper/HtmlHelper.php b/lib/Cake/View/Helper/HtmlHelper.php
@@ -1047,6 +1047,9 @@ public function media($path, $options = array()) {
 			$options['text'] = $sourceTags . $options['text'];
 			unset($options['fullBase']);
 		} else {
+			if (empty($path) && !empty($options['src'])) {
+				$path = $options['src'];
+			}
 			$options['src'] = $this->assetUrl($path, $options);
 		}