diff options
| author | Russell Keith-Magee <russell@keith-magee.com> | 2008-08-25 12:31:10 +0000 |
|---|---|---|
| committer | Russell Keith-Magee <russell@keith-magee.com> | 2008-08-25 12:31:10 +0000 |
| commit | 06d49768bd6974a455e6dd46e9526a093721897e (patch) | |
| tree | a935469e06636f1eb0a1655d243207aff509f019 /django | |
| parent | 78bdff1adc3afc8c6d192557d62bbcf313ab620c (diff) | |
Fixed #7743: Reverted [8483], which was itself a reversion of [8481], after confirmation from Malcolm. Corrected a long standing mistake in the timesince/timeuntil filters when using a parameter for 'now'. Thanks to Andrew Shearer <ashearerw@shearersoftware.com> for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8535 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django')
| -rw-r--r-- | django/template/defaultfilters.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/django/template/defaultfilters.py b/django/template/defaultfilters.py index cef314387a..1140f7ee40 100644 --- a/django/template/defaultfilters.py +++ b/django/template/defaultfilters.py @@ -643,7 +643,7 @@ def timesince(value, arg=None): if not value: return u'' if arg: - return timesince(arg, value) + return timesince(value, arg) return timesince(value) timesince.is_safe = False |