Changeset 91b516 in indico

Timestamp:

05/11/12 17:48:28 (12 months ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

Branches:

master, hello-world-walkthrough, ipv6, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, d9941f8582b36b24821a11ea5ba16fda6a457fb1

Children:

618995

Parents:

9a332c

git-author:

Pedro Ferreira <jose.pedro.ferreira@…> (05/11/12 17:46:34)

git-committer:

Pedro Ferreira <jose.pedro.ferreira@…> (05/11/12 17:48:28)

Message:

[FIX] Login issue when not using HTTPS

File:

• indico/MaKaC/webinterface/urlHandlers.py (modified) (1 diff)

indico/MaKaC/webinterface/urlHandlers.py

@@ -96 +96 @@
     @classmethod
     def _getURL(cls, **params):
-        return URL( "%s/%s"%(Config.getInstance().getBaseSecureURL(), cls.getRelativeURL()) , **params )
+        if Config.getInstance().getBaseSecureURL():
+            return URL( "%s/%s"%(Config.getInstance().getBaseSecureURL(), cls.getRelativeURL()) , **params )
+        else:
+            return super(SecureURLHandler, cls)._getURL(**params)
 
 class OptionallySecureURLHandler(URLHandler):