summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGary Wilson Jr <gary.wilson@gmail.com>2008-01-31 22:31:38 +0000
committerGary Wilson Jr <gary.wilson@gmail.com>2008-01-31 22:31:38 +0000
commitd72ce4f20c0fca12c2c70b130fdb63da57da28ab (patch)
tree32734d10082ca019757d1db1ba00a637776e93eb
parent9fcaf3504c8cdb8f211dba251ee0c1a6066509d7 (diff)
Fixed #6508 -- Fixed `add_domain` function to also work with https feed URLs, thanks Uninen.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7050 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/contrib/syndication/feeds.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/contrib/syndication/feeds.py b/django/contrib/syndication/feeds.py
index 57d092a5b5..a553ffb1f4 100644
--- a/django/contrib/syndication/feeds.py
+++ b/django/contrib/syndication/feeds.py
@@ -6,7 +6,7 @@ from django.utils.encoding import smart_unicode, iri_to_uri
from django.conf import settings
def add_domain(domain, url):
- if not url.startswith('http://'):
+ if not (url.startswith('http://') or url.startswith('https://')):
# 'url' must already be ASCII and URL-quoted, so no need for encoding
# conversions here.
url = iri_to_uri(u'http://%s%s' % (domain, url))