merged with master branch

1 files changed, 7 insertions, 4 deletions

diff --git a/forum/models/base.py b/forum/models/base.py
index 56cb95be..fb66ff1b 100755
--- a/forum/models/base.py
+++ b/forum/models/base.py
@@ -17,11 +17,15 @@ import django.dispatch
 from django.conf import settings
 import logging
 
-if settings.USE_SPHINX_SEARCH == True:
-    from djangosphinx.models import SphinxSearch
-
 from forum.const import *
 
+class UserContent(models.Model):
+    user = models.ForeignKey(User, related_name='%(class)ss')
+
+    class Meta:
+        abstract = True
+        app_label = 'forum'
+
 class MetaContent(models.Model):
     """
         Base class for Vote, Comment and FlaggedItem
@@ -29,7 +33,6 @@ class MetaContent(models.Model):
     content_type   = models.ForeignKey(ContentType)
     object_id      = models.PositiveIntegerField()
     content_object = generic.GenericForeignKey('content_type', 'object_id')
-    user           = models.ForeignKey(User, related_name='%(class)ss')
 
     class Meta:
         abstract = True