Connectors: Simplify auto-registration gate using is_active

Collapse the AI/non-AI branches in _wp_register_default_connector_settings()
into a single is_active callback check. AI providers already get an
is_active callback wired up at registration that delegates to the AI Client
registry, so one path covers both cases.

Add tests for is_active returning true (setting registered) and false
(setting skipped).

Author: jorgefilipecosta

src/wp-includes/connectors.php

@@ -549,10 +549,9 @@ function _wp_connectors_rest_settings_dispatch( WP_REST_Response $response, WP_R
  * @access private
  */
 function _wp_register_default_connector_settings(): void {
-	$ai_registry         = AiClient::defaultRegistry();
 	$registered_settings = get_registered_settings();
 
-	foreach ( wp_get_connectors() as $connector_id => $connector_data ) {
+	foreach ( wp_get_connectors() as $connector_data ) {
 		$auth = $connector_data['authentication'];
 		if ( 'api_key' !== $auth['method'] || empty( $auth['setting_name'] ) ) {
 			continue;
@@ -563,19 +562,12 @@ function _wp_register_default_connector_settings(): void {
 			continue;
 		}
 
-		if ( 'ai_provider' === $connector_data['type'] ) {
-		// For AI providers, skip if the provider is not in the AI Client registry.
-			if ( ! $ai_registry->hasProvider( $connector_id ) ) {
+		if ( ! isset( $connector_data['plugin']['is_active'] ) || ! is_callable( $connector_data['plugin']['is_active'] ) ) {
 			continue;
 		}
-		} else {
-			if ( ! isset( $connector_data['plugin']['is_active'] ) || ! is_callable( $connector_data['plugin']['is_active'] ) ) {
-				continue;
-			}
 
-			if ( ! call_user_func( $connector_data['plugin']['is_active'] ) ) {
-				continue;
-			}
+		if ( ! call_user_func( $connector_data['plugin']['is_active'] ) ) {
+			continue;
 		}
 
 		register_setting(

tests/phpunit/tests/connectors/wpRegisterDefaultConnectorSettings.php

@@ -44,7 +44,7 @@ public function tear_down(): void {
 	}
 
 	/**
-	 * @ticket 64730
+	 * @ticket 65099
 	 */
 	public function test_non_ai_connector_skipped_when_is_active_missing(): void {
 		WP_Connector_Registry::get_instance()->register(
@@ -64,4 +64,60 @@ public function test_non_ai_connector_skipped_when_is_active_missing(): void {
 
 		$this->assertArrayNotHasKey( self::SETTING_NAME, get_registered_settings() );
 	}
+
+	/**
+	 * @ticket 65099
+	 */
+	public function test_non_ai_connector_skipped_when_is_active_returns_false(): void {
+		WP_Connector_Registry::get_instance()->register(
+			self::CONNECTOR_ID,
+			array(
+				'name'           => 'Test Non-AI Connector',
+				'description'    => '',
+				'type'           => 'spam_filtering',
+				'authentication' => array(
+					'method'       => 'api_key',
+					'setting_name' => self::SETTING_NAME,
+				),
+				'plugin'         => array(
+					'file'      => 'test/test.php',
+					'is_active' => static function (): bool {
+						return false;
+					},
+				),
+			)
+		);
+
+		_wp_register_default_connector_settings();
+
+		$this->assertArrayNotHasKey( self::SETTING_NAME, get_registered_settings() );
+	}
+
+	/**
+	 * @ticket 65099
+	 */
+	public function test_non_ai_connector_registers_setting_when_is_active_returns_true(): void {
+		WP_Connector_Registry::get_instance()->register(
+			self::CONNECTOR_ID,
+			array(
+				'name'           => 'Test Non-AI Connector',
+				'description'    => '',
+				'type'           => 'spam_filtering',
+				'authentication' => array(
+					'method'       => 'api_key',
+					'setting_name' => self::SETTING_NAME,
+				),
+				'plugin'         => array(
+					'file'      => 'test/test.php',
+					'is_active' => static function (): bool {
+						return true;
+					},
+				),
+			)
+		);
+
+		_wp_register_default_connector_settings();
+
+		$this->assertArrayHasKey( self::SETTING_NAME, get_registered_settings() );
+	}
 }