From d3a0405faaa56abee12fd1938e15f0d1bb36d9b8 Mon Sep 17 00:00:00 2001
From: Raphael Michel <mail@raphaelmichel.de>
Date: Tue, 15 Dec 2020 09:56:03 +0100
Subject: [PATCH] Fix another bug in phone_format template tag

---
 src/pretix/base/templatetags/phone_format.py | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/pretix/base/templatetags/phone_format.py b/src/pretix/base/templatetags/phone_format.py
index 12f7317e08..4e81257e41 100644
--- a/src/pretix/base/templatetags/phone_format.py
+++ b/src/pretix/base/templatetags/phone_format.py
@@ -10,10 +10,13 @@ def phone_format(value: str):
     if not value:
         return ""
 
-    if isinstance(value, PhoneNumber) and value.as_international:
+    if isinstance(value, str):
+        try:
+            return PhoneNumber.from_string(value).as_international
+        except NumberParseException:
+            return value
+
+    if isinstance(value, PhoneNumber) and value.national_number:
         return value.as_international
 
-    try:
-        return PhoneNumber.from_string(value).as_international
-    except NumberParseException:
-        return value
+    return str(value)