Enabling Asset.timestamp for HtmlHelper::image() making it consistent…

… with Javascript::link(). Tests added. Fixes #6170 git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8078 3807eeeb-6ff5-0310-8944-8be069107fe0
cakephp · Mar 6, 2009 · c164be8 · c164be8
1 parent ffc537a
commit c164be8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/cake/libs/view/helpers/html.php b/cake/libs/view/helpers/html.php
@@ -435,7 +435,7 @@ function image($path, $options = array()) {
 		} elseif ($path[0] === '/') {
 			$path = $this->webroot($path);
 		} elseif (strpos($path, '://') === false) {
-			if (Configure::read('Asset.timestamp') == true && Configure::read() > 0) {
+			if (Configure::read('Asset.timestamp') == true && Configure::read() > 0 || Configure::read('Asset.timestamp') === 'force') {
 				$path .= '?' . @filemtime(str_replace('/', DS, WWW_ROOT . IMAGES_URL . $path));
 			}
 			$path = $this->webroot(IMAGES_URL . $path);

diff --git a/cake/tests/cases/libs/view/helpers/html.test.php b/cake/tests/cases/libs/view/helpers/html.test.php
@@ -240,8 +240,17 @@ function testImageTag() {
 
 		Configure::write('Asset.timestamp', true);
 
-		$result = $this->Html->image('logo.gif');
-		$this->assertTags($result, array('img' => array('src' => 'preg:/img\/logo\.gif\?\d*/', 'alt' => '')));
+		$result = $this->Html->image('cake.icon.gif');
+		$this->assertTags($result, array('img' => array('src' => 'preg:/img\/cake\.icon\.gif\?\d+/', 'alt' => '')));
+
+		$back = Configure::read('debug');
+		Configure::write('debug', 0);
+		Configure::write('Asset.timestamp', 'force');
+
+		$result = $this->Html->image('cake.icon.gif');
+		$this->assertTags($result, array('img' => array('src' => 'preg:/img\/cake\.icon\.gif\?\d+/', 'alt' => '')));
+
+		Configure::write('debug', $back);
 	}
 /**
  * testStyle method