Commit 3dc946e4 authored by Claude Paroz's avatar Claude Paroz
Browse files

Fixed #17236 -- Clarified that anonymous session data are retained after... 

Fixed #17236 -- Clarified that anonymous session data are retained after login. Thanks krzysiumed for the patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17704 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 78638a9a

django/contrib/auth/__init__.py

+2 −1
Original line number Diff line number Diff line
@@ -55,7 +55,8 @@ def authenticate(**credentials): 
def login(request, user):

    """

    Persist a user id and a backend in the request. This way a user doesn't

    have to reauthenticate on every request.

    have to reauthenticate on every request. Note that data set during

    the anonymous session is retained when the user logs in.

    """

    if user is None:

        user = request.user

docs/topics/auth.txt

+3 −0
Original line number Diff line number Diff line
@@ -727,6 +727,9 @@ Django provides two functions in :mod:`django.contrib.auth`: 
    using Django's session framework, so, as mentioned above, you'll need to

    make sure to have the session middleware installed.



    Note that data set during the anonymous session is retained when the user

    logs in.



    This example shows how you might use both

    :func:`~django.contrib.auth.authenticate()` and

    :func:`~django.contrib.auth.login()`::