summaryrefslogtreecommitdiff
path: root/chimere/views.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@peacefrogs.net>2012-09-03 09:31:30 +0200
committerÉtienne Loks <etienne.loks@peacefrogs.net>2012-09-03 09:31:30 +0200
commitb22587b733ffd1d71db307204366fafb59047804 (patch)
treeebacbe60ba4f1785670ccc49219d84d0b018686a /chimere/views.py
parentd1f5d131e6984d671670b8901e9449577fafae75 (diff)
parent36a48459497807c9299ef953f6fb8f6f8aa13f3d (diff)
downloadChimère-b22587b733ffd1d71db307204366fafb59047804.tar.bz2
Chimère-b22587b733ffd1d71db307204366fafb59047804.zip
Merge branch 'master' into saclay
Diffstat (limited to 'chimere/views.py')
-rw-r--r--chimere/views.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/chimere/views.py b/chimere/views.py
index e8fb622..4a97a62 100644
--- a/chimere/views.py
+++ b/chimere/views.py
@@ -59,8 +59,9 @@ def get_base_uri(request):
base_uri = 'https://'
if 'SERVER_NAME' in request.META:
base_uri += request.META['SERVER_NAME']
- if 'SERVER_PORT' in request.META:
- base_uri += ":" + request.META['SERVER_PORT']
+ if 'SERVER_PORT' in request.META and \
+ str(request.META['SERVER_PORT']) != '80':
+ base_uri += ":" + str(request.META['SERVER_PORT'])
return base_uri
#TODO: convert to requestcontext