Permalink
Browse files

Fixed #14414 -- Improved contenttypes shortcut() view to check that t…

…he ContentType has a model_class(). Thanks, subsume

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13994 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
1 parent 40765f1 commit 47cae1a2f6008382229b985f160846a7083726b6 @adrianholovaty adrianholovaty committed Oct 6, 2010
Showing with 2 additions and 0 deletions.
  1. +2 −0 django/contrib/contenttypes/views.py
View
2 django/contrib/contenttypes/views.py
@@ -8,6 +8,8 @@ def shortcut(request, content_type_id, object_id):
# Look up the object, making sure it's got a get_absolute_url() function.
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)
except (ObjectDoesNotExist, ValueError):
raise http.Http404("Content type %s object %s doesn't exist" % (content_type_id, object_id))

0 comments on commit 47cae1a

Please sign in to comment.