diff options
| author | Julien Phalip <jphalip@gmail.com> | 2012-07-01 18:40:50 -0700 |
|---|---|---|
| committer | Julien Phalip <jphalip@gmail.com> | 2012-07-01 18:40:50 -0700 |
| commit | 2cd4cf58d32c5d4b163a466f608dff31bac66b87 (patch) | |
| tree | 57b0311c4321b091d6c013193684ef6f265b508d /django | |
| parent | 7313468f85c3ade1275fc7fef193a4429f4af4bf (diff) | |
Fixed #18550 -- Ensured that the admin history view works with escaped primary keys.
Thanks to josh.oosterman for the report and patch.
Diffstat (limited to 'django')
| -rw-r--r-- | django/contrib/admin/options.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py index 3b899e552a..665e3f76b8 100644 --- a/django/contrib/admin/options.py +++ b/django/contrib/admin/options.py @@ -1321,7 +1321,7 @@ class ModelAdmin(BaseModelAdmin): opts = model._meta app_label = opts.app_label action_list = LogEntry.objects.filter( - object_id = object_id, + object_id = unquote(object_id), content_type__id__exact = ContentType.objects.get_for_model(model).id ).select_related().order_by('action_time') # If no history was found, see whether this object even exists. |