summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorKaren Tracey <kmtracey@gmail.com>2008-12-16 15:04:47 +0000
committerKaren Tracey <kmtracey@gmail.com>2008-12-16 15:04:47 +0000
commit10894da8a840a6d7d99add4bf372215b8a600f06 (patch)
treecf613a97f19f9bb921ec70afd67ef25f46126f63 /django
parent5f78eff9095e5563fe287910e91ffd8267e03ef3 (diff)
Fixed #9859 -- Added another missing force_unicode needed in admin when running on Python 2.3. Many thanks for report & patch to nfg.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9656 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django')
-rw-r--r--django/contrib/admin/util.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/contrib/admin/util.py b/django/contrib/admin/util.py
index 17213ea5b3..2ec507f924 100644
--- a/django/contrib/admin/util.py
+++ b/django/contrib/admin/util.py
@@ -104,7 +104,7 @@ def get_deleted_objects(deleted_objects, perms_needed, user, obj, opts, current_
if not has_admin:
# Don't display link to edit, because it either has no
# admin or is edited inline.
- nh(deleted_objects, current_depth, [u'%s: %s' % (force_unicode(capfirst(related.opts.verbose_name)), sub_obj), []])
+ nh(deleted_objects, current_depth, [u'%s: %s' % (capfirst(related.opts.verbose_name), force_unicode(sub_obj)), []])
else:
# Display a link to the admin page.
nh(deleted_objects, current_depth, [mark_safe(u'%s: <a href="../../../../%s/%s/%s/">%s</a>' % \