Changeset 5601 for django/branches/unicode/django/views
- Timestamp:
- 07/04/07 01:02:00 (2 years ago)
- Files:
-
- django/branches/unicode (modified) (1 prop)
- django/branches/unicode/django/views/defaults.py (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
django/branches/unicode
- Property svnmerge-integrated changed from /django/trunk:1-5579 to /django/trunk:1-5600
django/branches/unicode/django/views/defaults.py
r4612 r5601 22 22 23 23 # If the object actually defines a domain, we're done. 24 if absurl.startswith('http://') :24 if absurl.startswith('http://') or absurl.startswith('https://'): 25 25 return http.HttpResponseRedirect(absurl) 26 26 … … 62 62 # to whatever get_absolute_url() returned. 63 63 if object_domain is not None: 64 return http.HttpResponseRedirect('http://%s%s' % (object_domain, absurl)) 64 protocol = request.is_secure() and 'https' or 'http' 65 return http.HttpResponseRedirect('%s://%s%s' % (protocol, object_domain, absurl)) 65 66 else: 66 67 return http.HttpResponseRedirect(absurl)
