Merge branch 'master' of https://git.linux-kernel.at/oliver/ivatar

config.py

@@ -132,3 +132,5 @@ if os.path.isfile(os.path.join(BASE_DIR, 'config_local.py')):
     from config_local import *  # noqa # flake8: noqa # NOQA # pragma: no cover
 
 SESSION_SERIALIZER = 'django.contrib.sessions.serializers.PickleSerializer'
+
+USE_X_FORWARDED_HOST = True

templates/openid/login.html

@@ -29,10 +29,7 @@
 
 <p>
 <button type="submit" class="btn btn-default">{% trans 'Login' %}</button>
-<input type="hidden" name="next" id="next"/>
-<script>
-  document.getElementById("next").value = window.location.protocol + '//' + window.location.hostname + "{% url 'profile' %}";
-</script>
+<input type="hidden" name="next" value="{{ next }}" />
 &nbsp;
 <button type="reset" class="btn btn-default" onclick="window.history.back();">{% trans 'Cancel' %}</button>