innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed #4685 -- 'View on site' now works for https URLs. Thanks, cbrand@redback.com, treborhudson@gmail.com, Jeff Hilyard 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@5594 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2007-07-03 15:11:49 +00:00
parent ee7fe94d45
commit c7b49792f4
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
django/views/defaults.py
View File

@ -21,7 +21,7 @@ def shortcut(request, content_type_id, object_id):
# if necessary. # if necessary.
# If the object actually defines a domain, we're done. # If the object actually defines a domain, we're done.
if absurl.startswith('http://'): if absurl.startswith('http://') or absurl.startswith('https://'):
return http.HttpResponseRedirect(absurl) return http.HttpResponseRedirect(absurl)
object_domain = None object_domain = None
@ -61,7 +61,8 @@ def shortcut(request, content_type_id, object_id):
# If all that malarkey found an object domain, use it; otherwise fall back # If all that malarkey found an object domain, use it; otherwise fall back
# to whatever get_absolute_url() returned. # to whatever get_absolute_url() returned.
if object_domain is not None: if object_domain is not None:
return http.HttpResponseRedirect('http://%s%s' % (object_domain, absurl)) protocol = request.is_secure() and 'https' or 'http'
return http.HttpResponseRedirect('%s://%s%s' % (protocol, object_domain, absurl))
else: else:
return http.HttpResponseRedirect(absurl) return http.HttpResponseRedirect(absurl)