Ticket #25918: fix_25918_2.patch

File fix_25918_2.patch, 2.0 KB (added by Christoph Schindler, 9 years ago)

  • django/conf/global_settings.py 

    From 88a215e916b073fdbe467c478846802e78b963e3 Mon Sep 17 00:00:00 2001
From: Christoph Schindler <hop@30hopsmax.at>
Date: Fri, 11 Dec 2015 16:25:32 +0100
Subject: [PATCH] Fixed #25918 -- Removed LOGOUT_URL from global settings and
 documentation.

---
 django/conf/global_settings.py | 2 --
 docs/ref/settings.txt          | 9 ---------
 docs/releases/1.10.txt         | 6 ++++++
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py
index b85d355..cbcf5b4 100644
    a b AUTHENTICATION_BACKENDS = ['django.contrib.auth.backends.ModelBackend']  
    481481
    482482LOGIN_URL = '/accounts/login/'
    483483
    484 LOGOUT_URL = '/accounts/logout/'
    485 
    486484LOGIN_REDIRECT_URL = '/accounts/profile/'
    487485
    488486# The number of days a password reset link is valid for

  • docs/ref/settings.txt 

    diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index 491e888..fc5ef44 100644
    a b This setting also accepts view function names and :ref:`named URL patterns  
    26372637<naming-url-patterns>` which can be used to reduce configuration duplication
    26382638since you don't have to define the URL in two places (``settings`` and URLconf).
    26392639
    2640 .. setting:: LOGOUT_URL
    2641 
    2642 LOGOUT_URL
    2643 ----------
    2644 
    2645 Default: ``'/accounts/logout/'``
    2646 
    2647 LOGIN_URL counterpart.
    2648 
    26492640.. setting:: PASSWORD_RESET_TIMEOUT_DAYS
    26502641
    26512642PASSWORD_RESET_TIMEOUT_DAYS

  • docs/releases/1.10.txt 

    diff --git a/docs/releases/1.10.txt b/docs/releases/1.10.txt
index e86a061..491b7d4 100644
    a b Backwards incompatible changes in 1.10  
    278278    your code within the deprecation timeline for a given feature, its removal
    279279    may appear as a backwards incompatible change.
    280280
     281Settings
     282^^^^^^^^
     283
     284* The ``LOGOUT_URL`` setting has been removed. If you use this in your
     285  project, you can add it to your local configuration.
     286
    281287Database backend API
    282288~~~~~~~~~~~~~~~~~~~~
    283289
Back to Top