From bae33c323f0ae3e33a3eed1cfe1416f6bced84f2 Mon Sep 17 00:00:00 2001
From: "Enjeck C." <patrathewhiz@gmail.com>
Date: Tue, 14 Jul 2026 19:58:14 +0100
Subject: [PATCH] fix: enhance name splitting to handle 'Lastname, Firstname'
 format

Signed-off-by: Enjeck C. <patrathewhiz@gmail.com>
---
 apps/dav/lib/CardDAV/Converter.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/apps/dav/lib/CardDAV/Converter.php b/apps/dav/lib/CardDAV/Converter.php
index fd35a5cf351..f2d7a572b14 100644
--- a/apps/dav/lib/CardDAV/Converter.php
+++ b/apps/dav/lib/CardDAV/Converter.php
@@ -161,6 +161,14 @@ class Converter {
 		// Very basic western style parsing. I'm not gonna implement
 		// https://github.com/android/platform_packages_providers_contactsprovider/blob/master/src/com/android/providers/contacts/NameSplitter.java ;)
 
+		// Handle "Lastname, Firstname" format
+		if (str_contains($fullName, ',')) {
+			[$family, $given] = array_map('trim', explode(',', $fullName, 2));
+			if ($family !== '' && $given !== '') {
+				return [$family, $given, '', '', ''];
+			}
+		}
+
 		$elements = explode(' ', $fullName);
 		$result = ['', '', '', '', ''];
 		if (count($elements) > 2) {