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

changing numeric check in TimeHelper::wasWithinLast to remove the use of a php extension

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6761 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
DarkAngelBGE 2008-05-05 15:04:02 +00:00
parent 44fae51ce8
commit 85cd5adaf1
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cake/libs/view/helpers/time.php
View file

@ -431,7 +431,7 @@ class TimeHelper extends AppHelper {
*/
function wasWithinLast($timeInterval, $date_string) {
$tmp = r(' ', '', $timeInterval);
if (is_int($tmp) || preg_match('/[\d]+/', $tmp)) {
if (is_numeric($tmp)) {
$timeInterval = $tmp.' days';
}

2
cake/tests/cases/libs/view/helpers/time.test.php
View file

@ -501,7 +501,7 @@ class TimeTest extends UnitTestCase {
$this->assertTrue($this->Time->wasWithinLast('5 ', '-3 days'));
$this->assertTrue($this->Time->wasWithinLast('1 ', '-1 hour'));
$this->assertTrue($this->Time->wasWithinLast('1 ', '-1 minute'));
$this->assertTrue($this->Time->wasWithinLast('1 ', '-23 hours -59 minutes - 59 seconds'));
$this->assertTrue($this->Time->wasWithinLast('1 ', '-23 hours -59 minutes -59 seconds'));
}
function tearDown() {