Ticket #17200: django.contrib.contenttypes.views.diff

django/contrib/contenttypes/views.py

@@ -1 +1 @@
 from django import http
+from django.contrib.admin.util import unquote
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.sites.models import Site, get_current_site
 from django.core.exceptions import ObjectDoesNotExist
@@ -6 +7 @@
 def shortcut(request, content_type_id, object_id):
     "Redirect to an object's page based on a content-type ID and an object ID."
     # Look up the object, making sure it's got a get_absolute_url() function.
+    obj_id = unquote(object_id)
     try:
         content_type = ContentType.objects.get(pk=content_type_id)
         if not content_type.model_class():
             raise http.Http404("Content type %s object has no associated model" % content_type_id)
-        obj = content_type.get_object_for_this_type(pk=object_id)
+        obj = content_type.get_object_for_this_type(pk=obj_id)
     except (ObjectDoesNotExist, ValueError):
-        raise http.Http404("Content type %s object %s doesn't exist" % (content_type_id, object_id))
+        raise http.Http404("Content type %s object %s doesn't exist" % (content_type_id, obj_id))
     try:
         absurl = obj.get_absolute_url()
     except AttributeError: