summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGary Wilson Jr <gary.wilson@gmail.com>2008-01-31 22:33:50 +0000
committerGary Wilson Jr <gary.wilson@gmail.com>2008-01-31 22:33:50 +0000
commit28353a682dcd37ebbf6de886fa0f0e4719c53166 (patch)
treecdc6b17a20dcd39adb3d750d1d092aae507d7fa8
parentd72ce4f20c0fca12c2c70b130fdb63da57da28ab (diff)
Fixed `add_domain` call to use domain attribute of `current_site` so the function doesn't use the string representation of `current_site`.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7051 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/contrib/syndication/feeds.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/django/contrib/syndication/feeds.py b/django/contrib/syndication/feeds.py
index a553ffb1f4..45b97d970a 100644
--- a/django/contrib/syndication/feeds.py
+++ b/django/contrib/syndication/feeds.py
@@ -82,7 +82,8 @@ class Feed(object):
link = link,
description = self.__get_dynamic_attr('description', obj),
language = settings.LANGUAGE_CODE.decode(),
- feed_url = add_domain(current_site, self.__get_dynamic_attr('feed_url', obj)),
+ feed_url = add_domain(current_site.domain,
+ self.__get_dynamic_attr('feed_url', obj)),
author_name = self.__get_dynamic_attr('author_name', obj),
author_link = self.__get_dynamic_attr('author_link', obj),
author_email = self.__get_dynamic_attr('author_email', obj),