p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[1.5.x] Added compatibility with legacy message length 

Added compatibility code to not break when decoding messages
encoded on pre-1.5 versions.
Refs #19387. Thanks Florian Apolloner for noticing the issue.
This commit is contained in:
Claude Paroz 2012-12-21 13:36:22 +01:00
parent be10289d03
commit 9e7183073f
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
django/contrib/messages/storage/cookie.py
View File

@ -33,6 +33,9 @@ class MessageDecoder(json.JSONDecoder):
def process_messages(self, obj): def process_messages(self, obj):
if isinstance(obj, list) and obj: if isinstance(obj, list) and obj:
if obj[0] == MessageEncoder.message_key: if obj[0] == MessageEncoder.message_key:
if len(obj) == 3:
# Compatibility with previously-encoded messages
return Message(*obj[1:])
if obj[1]: if obj[1]:
obj[3] = mark_safe(obj[3]) obj[3] = mark_safe(obj[3])
return Message(*obj[2:]) return Message(*obj[2:])