From efb4478e484ae61c5fc23563d4e9df1f8f49df49 Mon Sep 17 00:00:00 2001
From: Timothy McCurrach <tim.mccurrach@gmail.com>
Date: Sat, 22 Jan 2022 02:06:17 +0000
Subject: [PATCH] Fixed #33458 -- Fixed encoding of messages with empty string
 as extra_tags.

---
 django/contrib/messages/storage/cookie.py |  2 +-
 tests/messages_tests/test_cookie.py       | 33 +++++++++++++++++------
 2 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/django/contrib/messages/storage/cookie.py b/django/contrib/messages/storage/cookie.py
index 1d390c71dd..e48d4edb08 100644
--- a/django/contrib/messages/storage/cookie.py
+++ b/django/contrib/messages/storage/cookie.py
@@ -19,7 +19,7 @@ class MessageEncoder(json.JSONEncoder):
             # Using 0/1 here instead of False/True to produce more compact json
             is_safedata = 1 if isinstance(obj.message, SafeData) else 0
             message = [self.message_key, is_safedata, obj.level, obj.message]
-            if obj.extra_tags:
+            if obj.extra_tags is not None:
                 message.append(obj.extra_tags)
             return message
         return super().default(obj)
diff --git a/tests/messages_tests/test_cookie.py b/tests/messages_tests/test_cookie.py
index 53cf693f61..248afae4f4 100644
--- a/tests/messages_tests/test_cookie.py
+++ b/tests/messages_tests/test_cookie.py
@@ -52,6 +52,12 @@ class CookieTests(BaseTests, SimpleTestCase):
     def stored_messages_count(self, storage, response):
         return stored_cookie_messages_count(storage, response)
 
+    def encode_decode(self, *args, **kwargs):
+        storage = self.get_storage()
+        message = Message(constants.DEBUG, *args, **kwargs)
+        encoded = storage._encode(message)
+        return storage._decode(encoded)
+
     def test_get(self):
         storage = self.storage_class(self.get_request())
         # Set initial data.
@@ -168,12 +174,23 @@ class CookieTests(BaseTests, SimpleTestCase):
         A message containing SafeData is keeping its safe status when
         retrieved from the message storage.
         """
-        def encode_decode(data):
-            message = Message(constants.DEBUG, data)
-            encoded = storage._encode(message)
-            decoded = storage._decode(encoded)
-            return decoded.message
+        self.assertIsInstance(
+            self.encode_decode(mark_safe('<b>Hello Django!</b>')).message,
+            SafeData,
+        )
+        self.assertNotIsInstance(
+            self.encode_decode('<b>Hello Django!</b>').message,
+            SafeData,
+        )
 
-        storage = self.get_storage()
-        self.assertIsInstance(encode_decode(mark_safe("<b>Hello Django!</b>")), SafeData)
-        self.assertNotIsInstance(encode_decode("<b>Hello Django!</b>"), SafeData)
+    def test_extra_tags(self):
+        """
+        A message's extra_tags attribute is correctly preserved when retrieved
+        from the message storage.
+        """
+        for extra_tags in ['', None, 'some tags']:
+            with self.subTest(extra_tags=extra_tags):
+                self.assertEqual(
+                    self.encode_decode('message', extra_tags=extra_tags).extra_tags,
+                    extra_tags,
+                )