Merge pull request #55576 from nextcloud/fix/ldap-configuration-prefix-list

come-nc · web-flow · commit 818f54d9ca9a · 2025-10-06T18:22:18.000+02:00
fix(ldap): Fix copying and creating LDAP configuration
diff --git a/apps/user_ldap/lib/Helper.php b/apps/user_ldap/lib/Helper.php
@@ -109,7 +109,7 @@ public function getNextServerConfigurationPrefix(): string {
 			$prefix = 's01';
 		} else {
 			sort($prefixes);
-			$lastKey = array_pop($prefixes);
+			$lastKey = end($prefixes);
 			$lastNumber = (int)str_replace('s', '', $lastKey);
 			$prefix = 's' . str_pad((string)($lastNumber + 1), 2, '0', STR_PAD_LEFT);
 		}

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ public function getNextServerConfigurationPrefix(): string {`
`109`	`109`	`$prefix = 's01';`
`110`	`110`	`} else {`
`111`	`111`	`sort($prefixes);`
`112`		`- $lastKey = array_pop($prefixes);`
	`112`	`+ $lastKey = end($prefixes);`
`113`	`113`	`$lastNumber = (int)str_replace('s', '', $lastKey);`
`114`	`114`	`$prefix = 's' . str_pad((string)($lastNumber + 1), 2, '0', STR_PAD_LEFT);`
`115`	`115`	`}`