Ticket #8630: 8630_r8782_admin.diff

django/contrib/comments/admin.py

@@ -2 +2 @@
 from django.conf import settings
 from django.contrib.comments.models import Comment
 from django.utils.translation import ugettext_lazy as _
+from django.contrib.comments import get_model
 
 class CommentsAdmin(admin.ModelAdmin):
     fieldsets = (
@@ -21 +22 @@
     date_hierarchy = 'submit_date'
     search_fields = ('comment', 'user__username', 'user_name', 'user_email', 'user_url', 'ip_address')
 
-admin.site.register(Comment, CommentsAdmin)
+if get_model() is Comment:
+    admin.site.register(Comment, CommentsAdmin)

django/contrib/comments/__init__.py

@@ -39 +39 @@
     return getattr(settings, 'COMMENTS_APP', 'django.contrib.comments')
 
 def get_model():
-    from django.contrib.comments.models import Comment
-    return Comment
+    if get_comment_app_name() == __name__:
+        from django.contrib.comments.models import Comment
+        return Comment
+    return get_comment_app().get_model()
 
 def get_form():
-    from django.contrib.comments.forms import CommentForm
-    return CommentForm
+    if get_comment_app_name() == __name__:
+        from django.contrib.comments.forms import CommentForm
+        return CommentForm
+    return get_comment_app().get_form()
 
 def get_form_target():
-    return urlresolvers.reverse("django.contrib.comments.views.comments.post_comment")
+    if get_comment_app_name() == __name__:
+        return urlresolvers.reverse("django.contrib.comments.views.comments.post_comment")
+    return get_comment_app().get_form_target()
 
 def get_flag_url(comment):
     """