Development

Changeset 8764

You must first sign up to be able to contribute.

Changeset 8764

Show
Ignore:
Timestamp:
05/04/08 09:24:53 (4 months ago)
Author:
fabien
Message:

fixed DateHelper? distance_of_time_in_words() generates incorrect output for some dates (closes #3322)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/1.1/lib/helper/DateHelper.php

    r7757 r8764  
    149149  { 
    150150    $string = 'over %years% years'; 
    151     $parameters['%years%'] = round($distance_in_minutes / 525960); 
     151    $parameters['%years%'] = floor($distance_in_minutes / 525960); 
    152152  } 
    153153 
  • branches/1.1/test/unit/helper/DateHelperTest.php

    r7757 r8764  
    1212require_once($_test_dir.'/unit/sfContextMock.class.php'); 
    1313 
    14 $t = new lime_test(493, new lime_output_color()); 
     14$t = new lime_test(494, new lime_output_color()); 
    1515 
    1616class sfUser 
     
    6161 
    6262$t->is(distance_of_time_in_words($now - 370 * 86400, $now), 'about 1 year', $msg); 
    63 $t->is(distance_of_time_in_words($now - 4 * 365 * 86400, $now), 'over 4 years', $msg); 
     63$t->is(distance_of_time_in_words($now - 4 * 370 * 86400, $now), 'over 4 years', $msg); 
     64$t->is(distance_of_time_in_words($now - 1000 * 86400, $now), 'over 2 years', $msg); 
    6465 
    6566// format_date()