Merge master 0.2.3 bugfixes into develop

This commit is contained in:
Garret Wassermann
2017-12-09 23:02:12 -05:00
23 changed files with 3472 additions and 540 deletions

View File

@ -267,13 +267,14 @@ def text_is_spam(text, request):
# False if it is not spam. If it cannot be checked for some reason, we
# assume it isn't spam.
from django.contrib.sites.models import Site
from django.core.exceptions import ImproperlyConfigured
try:
from helpdesk.akismet import Akismet
except:
except ImportError:
return False
try:
site = Site.objects.get_current()
except:
except ImproperlyConfigured:
site = Site(domain='configure-django-sites.com')
ak = Akismet(