[1.2.X] Tweaked the changes from changeset r15580 so as to avoid introducing a...

[1.2.X] Tweaked the changes from changeset r15580 so as to avoid introducing a backwards incompatible context change to the change_list_results template. Refs #13126. Thanks to Sean Brant for the report.

Backport of r15593 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15594 bcc190cf-cafb-0310-a4f2-bffc1f526a37