From e12f44d0b546d50d95b076487359b3db9157725a Mon Sep 17 00:00:00 2001
From: Agate <me@agate.blue>
Date: Fri, 19 Jun 2020 13:53:13 +0200
Subject: [PATCH] Fix #1161: crash with null help text in admin

---
 api/funkwhale_api/common/serializers.py | 4 +++-
 changes/changelog.d/1161.bugfix         | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 changes/changelog.d/1161.bugfix

diff --git a/api/funkwhale_api/common/serializers.py b/api/funkwhale_api/common/serializers.py
index f5565f133..76e698c5f 100644
--- a/api/funkwhale_api/common/serializers.py
+++ b/api/funkwhale_api/common/serializers.py
@@ -320,7 +320,9 @@ class AttachmentSerializer(serializers.Serializer):
 
 
 class ContentSerializer(serializers.Serializer):
-    text = serializers.CharField(max_length=models.CONTENT_TEXT_MAX_LENGTH)
+    text = serializers.CharField(
+        max_length=models.CONTENT_TEXT_MAX_LENGTH, allow_null=True
+    )
     content_type = serializers.ChoiceField(choices=models.CONTENT_TEXT_SUPPORTED_TYPES,)
     html = serializers.SerializerMethodField()
 
diff --git a/changes/changelog.d/1161.bugfix b/changes/changelog.d/1161.bugfix
new file mode 100644
index 000000000..2c602fb42
--- /dev/null
+++ b/changes/changelog.d/1161.bugfix
@@ -0,0 +1 @@
+Fixed crash with null help text in admin (#1161)