Ticket #10738: deferred_model_contenttype.diff

django/contrib/contenttypes/models.py

@@ -15 +15 @@
         for the same model don't hit the database.
         """
         opts = model._meta
-        key = (opts.app_label, opts.object_name.lower())
+        if model._deferred:
+            model_name = opts.proxy_for_model._meta.object_name.lower()
+            name = smart_unicode(opts.proxy_for_model._meta.verbose_name_raw)
+        else:
+            model_name = opts.object_name.lower()
+            name = smart_unicode(opts.verbose_name_raw)
+        key = (opts.app_label, model_name)
         try:
             ct = self.__class__._cache[key]
         except KeyError:
@@ -24 +30 @@
             # django.utils.functional.__proxy__ object.
             ct, created = self.get_or_create(
                 app_label = opts.app_label,
-                model = opts.object_name.lower(), 
-                defaults = {'name': smart_unicode(opts.verbose_name_raw)},
+                model = model_name, 
+                defaults = {'name': name},
             )
             self._add_to_cache(ct)