From 3391d78773508b4b2a29281659c4c10d96cbe3df Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Wed, 29 Jun 2011 11:54:57 -0700 Subject: [PATCH] Check for 'django.contrib.sites' when getting the domain for chartbeat --- analytical/templatetags/chartbeat.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/analytical/templatetags/chartbeat.py b/analytical/templatetags/chartbeat.py index 0689c68..0e60ab9 100644 --- a/analytical/templatetags/chartbeat.py +++ b/analytical/templatetags/chartbeat.py @@ -100,9 +100,14 @@ def contribute_to_analytical(add_node): def _get_domain(context): domain = context.get(DOMAIN_CONTEXT_KEY) - if domain is None and getattr(settings, 'CHARTBEAT_AUTO_DOMAIN', True): - try: - domain = Site.objects.get_current().domain - except (ImproperlyConfigured, Site.DoesNotExist): #pylint: disable=E1101 - pass - return domain + + if domain is not None: + return domain + else: + if 'django.contrib.sites' not in settings.INSTALLED_APPS: + return + elif getattr(settings, 'CHARTBEAT_AUTO_DOMAIN', True): + try: + return Site.objects.get_current().domain + except (ImproperlyConfigured, Site.DoesNotExist): #pylint: disable=E1101 + return