adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-04-04 08:03:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Making conditions easier to read.

Browse source 
Adding additional test for image timestamping.
Refs
This commit is contained in:
mark_story 2009-09-22 19:04:40 -04:00
parent de4737323f
commit 26d2237df0
3 changed files with 19 additions and 3 deletions
cake
libs/view/helpers
html.phpjavascript.php
tests/cases/libs/view/helpers
html.test.php

7
cake/libs/view/helpers/html.php
View file

@ -373,9 +373,12 @@ class HtmlHelper extends AppHelper {
$path .= '.css';
}
}
$timestampEnabled = (
(Configure::read('Asset.timestamp') === true && Configure::read() > 0) ||
Configure::read('Asset.timestamp') === 'force'
);
$url = $this->webroot($path);
if (strpos($path, '?') === false && ((Configure::read('Asset.timestamp') === true && Configure::read() > 0) || Configure::read('Asset.timestamp') === 'force')) {
if (strpos($path, '?') === false && $timestampEnabled) {
$url .= '?' . @filemtime(WWW_ROOT . str_replace('/', DS, $path));
}

6
cake/libs/view/helpers/javascript.php
View file

@ -270,8 +270,12 @@ class JavascriptHelper extends AppHelper {
$url .= '.js';
}
}
$timestampEnabled = (
(Configure::read('Asset.timestamp') === true && Configure::read() > 0) ||
Configure::read('Asset.timestamp') === 'force'
);
if (strpos($url, '?') === false && ((Configure::read('Asset.timestamp') === true && Configure::read() > 0) || Configure::read('Asset.timestamp') === 'force')) {
if (strpos($url, '?') === false && $timestampEnabled) {
$url = $this->webroot($url) . '?' . @filemtime(WWW_ROOT . str_replace('/', DS, $url));
} else {
$url = $this->webroot($url);

9
cake/tests/cases/libs/view/helpers/html.test.php
View file

@ -308,6 +308,15 @@ class HtmlHelperTest extends CakeTestCase {
$result = $this->Html->image('cake.icon.gif');
$this->assertTags($result, array('img' => array('src' => 'preg:/img\/cake\.icon\.gif\?\d+/', 'alt' => '')));
$webroot = $this->Html->webroot;
$this->Html->webroot = '/testing/longer/';
$result = $this->Html->image('cake.icon.gif');
$expected = array(
'img' => array('src' => 'preg:/\/testing\/longer\/img\/cake\.icon\.gif\?[0-9]+/', 'alt' => '')
);
$this->assertTags($result, $expected);
$this->Html->webroot = $webroot;
}
/**