From 948522c5995a93f73a5288072480f5563fb0137c Mon Sep 17 00:00:00 2001
From: jose-gonzalez-motork
 <139996590+jose-gonzalez-motork@users.noreply.github.com>
Date: Mon, 29 Dec 2025 10:53:04 +0100
Subject: [PATCH 1/5] Increase the max users limit

---
 includes/MslsAdmin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/MslsAdmin.php b/includes/MslsAdmin.php
index 5120dfd0..4f9e6363 100644
--- a/includes/MslsAdmin.php
+++ b/includes/MslsAdmin.php
@@ -35,7 +35,7 @@ final class MslsAdmin extends MslsMain {
 	 *
 	 * @var int
 	 */
-	public const MAX_REFERENCE_USERS = 100;
+	public const MAX_REFERENCE_USERS = 200;
 
 	/**
 	 * @codeCoverageIgnore

From 2b1229d19ed77abfc0874b2693d27af78b889b81 Mon Sep 17 00:00:00 2001
From: jose-gonzalez-motork
 <139996590+jose-gonzalez-motork@users.noreply.github.com>
Date: Mon, 29 Dec 2025 17:10:35 +0100
Subject: [PATCH 2/5] Update TestMslsAdmin.php

---
 tests/phpunit/TestMslsAdmin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/phpunit/TestMslsAdmin.php b/tests/phpunit/TestMslsAdmin.php
index bd410c78..f92801d1 100644
--- a/tests/phpunit/TestMslsAdmin.php
+++ b/tests/phpunit/TestMslsAdmin.php
@@ -138,7 +138,7 @@ static function ( $errno, $errstr ) {
 
 		$this->expectException( \Exception::class );
 		$this->expectExceptionMessage(
-			'Multisite Language Switcher: Collection for reference user has been truncated because it exceeded the maximum of 100 users. Please, use the hook "msls_reference_users" to filter the result before!'
+			'Multisite Language Switcher: Collection for reference user has been truncated because it exceeded the maximum of 200 users. Please, use the hook "msls_reference_users" to filter the result before!'
 		);
 
 		$obj->reference_user();

From 203572e7363dc08965150b847a5cbf7ede06d484 Mon Sep 17 00:00:00 2001
From: jose-gonzalez-motork
 <139996590+jose-gonzalez-motork@users.noreply.github.com>
Date: Mon, 29 Dec 2025 17:12:44 +0100
Subject: [PATCH 3/5] Update TestMslsAdmin.php

Replace the number with the constant
---
 tests/phpunit/TestMslsAdmin.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/phpunit/TestMslsAdmin.php b/tests/phpunit/TestMslsAdmin.php
index f92801d1..fdf3dbd4 100644
--- a/tests/phpunit/TestMslsAdmin.php
+++ b/tests/phpunit/TestMslsAdmin.php
@@ -138,7 +138,10 @@ static function ( $errno, $errstr ) {
 
 		$this->expectException( \Exception::class );
 		$this->expectExceptionMessage(
-			'Multisite Language Switcher: Collection for reference user has been truncated because it exceeded the maximum of 200 users. Please, use the hook "msls_reference_users" to filter the result before!'
+		    sprintf(
+		        'Multisite Language Switcher: Collection for reference user has been truncated because it exceeded the maximum of %d users. Please, use the hook "msls_reference_users" to filter the result before!',
+		        MslsAdmin::MAX_REFERENCE_USERS
+		    )
 		);
 
 		$obj->reference_user();

From b94529849119be6f02c8a669e85aacc9c5b01131 Mon Sep 17 00:00:00 2001
From: Dennis Ploetner <re@lloc.de>
Date: Mon, 12 Jan 2026 16:24:45 +0100
Subject: [PATCH 4/5] New logic for max_users implemented

---
 includes/MslsAdmin.php                   | 26 ++++++-------------
 includes/MslsBlogCollection.php          | 23 ++++++++++++++---
 tests/phpunit/TestMslsAdmin.php          | 33 ++----------------------
 tests/phpunit/TestMslsBlogCollection.php | 23 +++++++++++++++++
 4 files changed, 52 insertions(+), 53 deletions(-)

diff --git a/includes/MslsAdmin.php b/includes/MslsAdmin.php
index 4f9e6363..637d3857 100644
--- a/includes/MslsAdmin.php
+++ b/includes/MslsAdmin.php
@@ -35,7 +35,7 @@ final class MslsAdmin extends MslsMain {
 	 *
 	 * @var int
 	 */
-	public const MAX_REFERENCE_USERS = 200;
+	public const MAX_REFERENCE_USERS = 100;
 
 	/**
 	 * @codeCoverageIgnore
@@ -378,27 +378,17 @@ public function admin_display(): void {
 	 * Shows the select-form-field 'reference_user'
 	 */
 	public function reference_user(): void {
-		$users = array();
+		$max_users = (int) apply_filters( 'msls_max_reference_users_count', self::MAX_REFERENCE_USERS );
 
-		foreach ( (array) apply_filters( 'msls_reference_users', $this->collection->get_users() ) as $user ) {
-			$users[ $user->ID ] = $user->user_nicename;
-		}
-
-		if ( count( $users ) > self::MAX_REFERENCE_USERS ) {
-			$users = array_slice( $users, 0, self::MAX_REFERENCE_USERS, true );
+		$users_collection = $this->collection->get_users( array( 'ID', 'user_nicename' ), $max_users );
 
-			/* translators: %s: maximum number of users */
-			$format = __(
-				'Multisite Language Switcher: Collection for reference user has been truncated because it exceeded the maximum of %d users. Please, use the hook "msls_reference_users" to filter the result before!',
-				'multisite-language-switcher'
-			);
-
-			// phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_trigger_error
-			trigger_error( esc_html( sprintf( $format, strval( self::MAX_REFERENCE_USERS ) ) ) );
-		}
+		$reference_users = (array) apply_filters(
+			'msls_reference_users',
+			wp_list_pluck( $users_collection, 'user_nicename', 'ID' )
+		);
 
         // phpcs:ignore WordPress.Security.EscapeOutput
-		echo ( new Select( 'reference_user', $users, strval( $this->options->reference_user ) ) )->render();
+		echo ( new Select( 'reference_user', $reference_users, strval( $this->options->reference_user ) ) )->render();
 	}
 
 	/**
diff --git a/includes/MslsBlogCollection.php b/includes/MslsBlogCollection.php
index 5cdf86ad..7ac4db8f 100644
--- a/includes/MslsBlogCollection.php
+++ b/includes/MslsBlogCollection.php
@@ -301,20 +301,35 @@ public function get_filtered( bool $filter = false ): array {
 	/**
 	 * Gets the registered users of the current blog
 	 *
-	 * @param string     $fields
-	 * @param int|string $number
+	 * @param string|string[] $fields
+	 * @param int             $number
 	 *
 	 * @return array<string, int>
 	 */
-	public function get_users( $fields = 'all', $number = '' ) {
+	public function get_users( $fields = 'all', int $number = 0 ): array {
 		$args = array(
 			'blog_id'     => $this->current_blog_id,
 			'orderby'     => 'registered',
 			'fields'      => $fields,
-			'number'      => $number,
 			'count_total' => false,
 		);
 
+		if ( $number > 1 ) {
+			$args['number'] = $number;
+
+			$user_count = count_users();
+			if ( isset( $user_count['total_users'] ) && $user_count['total_users'] > $number ) {
+				/* translators: %s: maximum number of users */
+				$format = __(
+					'Multisite Language Switcher: The user list has been limited to %d users.',
+					'multisite-language-switcher'
+				);
+
+				// phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_trigger_error
+				trigger_error( esc_html( sprintf( $format, strval( $number ) ) ) );
+			}
+		}
+
 		$args = (array) apply_filters( 'msls_get_users', $args );
 
 		return get_users( $args );
diff --git a/tests/phpunit/TestMslsAdmin.php b/tests/phpunit/TestMslsAdmin.php
index fdf3dbd4..318d618c 100644
--- a/tests/phpunit/TestMslsAdmin.php
+++ b/tests/phpunit/TestMslsAdmin.php
@@ -116,38 +116,9 @@ public function test_admin_display(): void {
 		$obj->admin_display();
 	}
 
-	public function test_reference_user(): void {
-		$users    = array();
-		$too_much = MslsAdmin::MAX_REFERENCE_USERS + 1;
-		for ( $i = 1; $i <= $too_much; $i++ ) {
-			$users[] = (object) array(
-				'ID'            => $i,
-				'user_nicename' => 'realloc',
-			);
-		}
-
-		$obj = $this->MslsAdminFactory( $users );
-
-		set_error_handler(
-			static function ( $errno, $errstr ) {
-				restore_error_handler();
-				throw new \Exception( $errstr, $errno );
-			},
-			E_ALL
-		);
-
-		$this->expectException( \Exception::class );
-		$this->expectExceptionMessage(
-		    sprintf(
-		        'Multisite Language Switcher: Collection for reference user has been truncated because it exceeded the maximum of %d users. Please, use the hook "msls_reference_users" to filter the result before!',
-		        MslsAdmin::MAX_REFERENCE_USERS
-		    )
-		);
-
-		$obj->reference_user();
-	}
-
 	public function test_reference_user_over_max(): void {
+		$users = array( 1 => 'realloc' );
+		Functions\expect( 'wp_list_pluck' )->once()->andReturn( $users );
 		$obj = $this->MslsAdminFactory();
 
 		$this->expectOutputRegex( '/^<select id="reference_user" name="msls\[reference_user\]">.*$/' );
diff --git a/tests/phpunit/TestMslsBlogCollection.php b/tests/phpunit/TestMslsBlogCollection.php
index 867152d0..5d7ca64c 100644
--- a/tests/phpunit/TestMslsBlogCollection.php
+++ b/tests/phpunit/TestMslsBlogCollection.php
@@ -12,6 +12,8 @@ final class TestMslsBlogCollection extends MslsUnitTestCase {
 	protected function setUp(): void {
 		parent::setUp(); // TODO: Change the autogenerated stub
 
+		Functions\when( 'count_users' )->justReturn( array( 'total_users' => 3210 ) );
+
 		$options = \Mockery::mock( MslsOptions::class );
 		$options->shouldReceive( 'get_order' )->andReturn( 'description' );
 		$options->shouldReceive( 'is_excluded' )->andReturn( false );
@@ -199,6 +201,27 @@ public function test_get_users(): void {
 		$this->assertIsArray( $obj->get_users() );
 	}
 
+	public function test_get_users_max() {
+		Functions\expect( 'get_site_option' )->once()->andReturn( array() );
+
+		$max_users = 100;
+
+		$obj = new MslsBlogCollection();
+
+		set_error_handler(
+			static function ( $errno, $errstr ) {
+				restore_error_handler();
+				throw new \Exception( $errstr, $errno );
+			},
+			E_ALL
+		);
+
+		$this->expectException( \Exception::class );
+		$this->expectExceptionMessage( "Multisite Language Switcher: The user list has been limited to {$max_users} users." );
+
+		$obj->get_users( 'all', $max_users );
+	}
+
 	public function test_get_current_blog(): void {
 		Functions\expect( 'get_site_option' )->once()->andReturn( array() );
 

From 7555790e5a8248fd7f58aae0384c4a04f9fa0620 Mon Sep 17 00:00:00 2001
From: Dennis Ploetner <re@lloc.de>
Date: Mon, 12 Jan 2026 16:53:13 +0100
Subject: [PATCH 5/5] Safer number setting

---
 includes/MslsBlogCollection.php          | 16 ++++++----------
 tests/phpunit/TestMslsBlogCollection.php | 16 +++++++++++++---
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/includes/MslsBlogCollection.php b/includes/MslsBlogCollection.php
index 7ac4db8f..ed7afd01 100644
--- a/includes/MslsBlogCollection.php
+++ b/includes/MslsBlogCollection.php
@@ -126,12 +126,9 @@ public static function get_configured_blog_description( int $blog_id, $descripti
 	 * @return object[]|\stdClass[]
 	 */
 	public function get_blogs_of_reference_user( MslsOptions $options ) {
-		$reference_user = $options->has_value( 'reference_user' ) ? $options->reference_user : current(
-			$this->get_users(
-				'ID',
-				1
-			)
-		);
+		$reference_user = $options->has_value( 'reference_user' ) ?
+			$options->reference_user :
+			current( $this->get_users( 'ID', 1 ) );
 
 		$blogs = get_blogs_of_user( $reference_user );
 		foreach ( $blogs as $key => $blog ) {
@@ -306,17 +303,16 @@ public function get_filtered( bool $filter = false ): array {
 	 *
 	 * @return array<string, int>
 	 */
-	public function get_users( $fields = 'all', int $number = 0 ): array {
+	public function get_users( $fields = 'all', int $number = MslsAdmin::MAX_REFERENCE_USERS ): array {
 		$args = array(
 			'blog_id'     => $this->current_blog_id,
 			'orderby'     => 'registered',
 			'fields'      => $fields,
+			'number'      => $number > 0 ? $number : MslsAdmin::MAX_REFERENCE_USERS,
 			'count_total' => false,
 		);
 
-		if ( $number > 1 ) {
-			$args['number'] = $number;
-
+		if ( $number !== 1 ) { // Check total users only if not fetching a single user
 			$user_count = count_users();
 			if ( isset( $user_count['total_users'] ) && $user_count['total_users'] > $number ) {
 				/* translators: %s: maximum number of users */
diff --git a/tests/phpunit/TestMslsBlogCollection.php b/tests/phpunit/TestMslsBlogCollection.php
index 5d7ca64c..1ab2329d 100644
--- a/tests/phpunit/TestMslsBlogCollection.php
+++ b/tests/phpunit/TestMslsBlogCollection.php
@@ -9,10 +9,12 @@
 
 final class TestMslsBlogCollection extends MslsUnitTestCase {
 
+	const TOTAL_USERS = 3210;
+
 	protected function setUp(): void {
 		parent::setUp(); // TODO: Change the autogenerated stub
 
-		Functions\when( 'count_users' )->justReturn( array( 'total_users' => 3210 ) );
+		Functions\when( 'count_users' )->justReturn( array( 'total_users' => self::TOTAL_USERS ) );
 
 		$options = \Mockery::mock( MslsOptions::class );
 		$options->shouldReceive( 'get_order' )->andReturn( 'description' );
@@ -193,12 +195,20 @@ public function test_get_filtered(): void {
 		$this->assertIsArray( $obj->get_filtered( true ) );
 	}
 
-	public function test_get_users(): void {
+	public function test_get_users_single(): void {
+		Functions\expect( 'get_site_option' )->once()->andReturn( array() );
+
+		$obj = new MslsBlogCollection();
+
+		$this->assertIsArray( $obj->get_users( array( 'ID' ), 1 ) );
+	}
+
+	public function test_get_users_massive(): void {
 		Functions\expect( 'get_site_option' )->once()->andReturn( array() );
 
 		$obj = new MslsBlogCollection();
 
-		$this->assertIsArray( $obj->get_users() );
+		$this->assertIsArray( $obj->get_users( array( 'ID' ), self::TOTAL_USERS ) );
 	}
 
 	public function test_get_users_max() {