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
This commit is contained in:
parent
9fcaf3504c
commit
d72ce4f20c
|
@ -6,7 +6,7 @@ from django.utils.encoding import smart_unicode, iri_to_uri
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
|
|
||||||
def add_domain(domain, url):
|
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
|
# 'url' must already be ASCII and URL-quoted, so no need for encoding
|
||||||
# conversions here.
|
# conversions here.
|
||||||
url = iri_to_uri(u'http://%s%s' % (domain, url))
|
url = iri_to_uri(u'http://%s%s' % (domain, url))
|
||||||
|
|
Loading…
Reference in New Issue