Ticket #3185: login_url2.diff

django/contrib/auth/views.py

@@ -6 +6 @@
 from django.contrib.sites.models import Site
 from django.http import HttpResponseRedirect
 from django.contrib.auth.decorators import login_required
-from django.contrib.auth import LOGIN_URL, REDIRECT_FIELD_NAME
+from django.contrib.auth import LOGIN_URL, REDIRECT_FIELD_NAME, ACCOUNT_URL
 
 def login(request, template_name='registration/login.html'):
     "Displays the login form and handles the login action."
@@ -17 +17 @@
         if not errors:
             # Light security check -- make sure redirect_to isn't garbage.
             if not redirect_to or '://' in redirect_to or ' ' in redirect_to:
-                redirect_to = '/accounts/profile/'
+                redirect_to = ACCOUNT_URL
             from django.contrib.auth import login
             login(request, manipulator.get_user())
             request.session.delete_test_cookie()

django/contrib/auth/__init__.py

@@ -1 +1 @@
 from django.core.exceptions import ImproperlyConfigured
 
+from django.conf import settings
+
 SESSION_KEY = '_auth_user_id'
 BACKEND_SESSION_KEY = '_auth_user_backend'
-LOGIN_URL = '/accounts/login/'
+
+try:
+    LOGIN_URL = settings.LOGIN_URL
+except AttributeError:
+    LOGIN_URL = '/accounts/login/'
+
+try:
+    ACCOUNT_URL = settings.ACCOUNT_URL
+except AttributeError:
+    ACCOUNT_URL = '/accounts/profile/'
+
 REDIRECT_FIELD_NAME = 'next'
 
 def load_backend(path):