test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #17257 - Removed outdated comment in syndication view 

Thanks krzysiumed for the patch.
This commit is contained in:
Claude Paroz 2012-07-07 11:34:04 +02:00
parent 8855f9380e
commit 8dafd04c45
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
django/contrib/syndication/views.py
View File

@ -10,6 +10,7 @@ from django.utils.encoding import force_unicode, iri_to_uri, smart_unicode
from django.utils.html import escape from django.utils.html import escape
from django.utils.timezone import is_naive from django.utils.timezone import is_naive
def add_domain(domain, url, secure=False): def add_domain(domain, url, secure=False):
protocol = 'https' if secure else 'http' protocol = 'https' if secure else 'http'
if url.startswith('//'): if url.startswith('//'):
@ -18,8 +19,6 @@ def add_domain(domain, url, secure=False):
elif not (url.startswith('http://') elif not (url.startswith('http://')
or url.startswith('https://') or url.startswith('https://')
or url.startswith('mailto:')): or url.startswith('mailto:')):
# 'url' must already be ASCII and URL-quoted, so no need for encoding
# conversions here.
url = iri_to_uri('%s://%s%s' % (protocol, domain, url)) url = iri_to_uri('%s://%s%s' % (protocol, domain, url))
return url return url